From f9a287c86982e2263348d6933283bd4458c2fbe9 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 3 Dec 2021 13:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=A4=BA=E4=BE=8B=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeesite/modules/sys/db/InitCoreData.java | 172 +----------------- .../jeesite/modules/test/db/InitTestData.java | 151 +++++++++++++++ 2 files changed, 157 insertions(+), 166 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index a31169cb..df210394 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -12,11 +12,7 @@ import org.springframework.stereotype.Component; import com.jeesite.common.callback.MethodCallback; import com.jeesite.common.config.Global; import com.jeesite.common.idgen.IdGen; -import com.jeesite.common.lang.StringUtils; import com.jeesite.common.tests.BaseInitDataTests; -import com.jeesite.modules.gen.entity.GenTable; -import com.jeesite.modules.gen.entity.GenTableColumn; -import com.jeesite.modules.gen.service.GenTableService; import com.jeesite.modules.gen.utils.GenUtils; import com.jeesite.modules.job.dao.JobDao; import com.jeesite.modules.job.entity.JobEntity; @@ -77,26 +73,9 @@ public class InitCoreData extends BaseInitDataTests { this.initPost(); this.initEmpUser(); this.initJob(); - this.initGenDemoData(); return true; } -// /** -// * 建表语句执行 -// */ -// public void createTable() throws Exception{ -// runScript("core.sql"); -// runScript("job.sql"); -// runScript("test.sql"); -// } -// -// /** -// * 清理日志表 -// */ -// public void initLog() throws Exception{ -// clearTable(Log.class); -// } - // @Autowired // private AreaService areaService; /** @@ -373,7 +352,11 @@ public class InitCoreData extends BaseInitDataTests { @Override public Object execute(Object... params) { String action = (String)params[0]; - if("set".equals(action)){ + if("check".equals(action)){ + User user = new User(); + user.setLoginCode("user1"); + return userService.getByLoginCode(user) == null; + }else if("set".equals(action)){ EmpUser entity = (EmpUser)params[1]; String header = (String)params[2]; String val = (String)params[3]; @@ -384,8 +367,7 @@ public class InitCoreData extends BaseInitDataTests { entity.getEmployee().setEmployeePosts(new String[]{val}); return true; } - } - else if("save".equals(action)){ + }else if("save".equals(action)){ EmpUser entity = (EmpUser)params[1]; entity.setIsNewRecord(true); empUserService.save(entity); @@ -426,148 +408,6 @@ public class InitCoreData extends BaseInitDataTests { jobDao.insert(job); } - @Autowired - private GenTableService genTableService; - /** - * 代码生成测试数据 - */ - public void initGenDemoData() throws Exception{ - if (!checkTable(GenTable.class)) { - return; - } - if (!checkTable(GenTableColumn.class)) { - return; - } - initGenTestData(); - initGenTreeData(); - } - /** - * 代码生成测试数据 - */ - private void initGenTestData() throws Exception{ - GenTable genTable = new GenTable(); - genTable.setIsNewRecord(true); - genTable.setTableName("test_data"); - genTable = genTableService.getFromDb(genTable); - genTable.setIsNewRecord(true); - genTable.setClassName("TestData"); - genTable.setFunctionAuthor("ThinkGem"); - genTable.setTplCategory("crud"); - genTable.setPackageName("com.jeesite.modules"); - genTable.setModuleName("test"); - genTable.setSubModuleName(""); - genTable.setFunctionName("测试数据"); - genTable.setFunctionNameSimple("数据"); - genTable.getOptionMap().put("isHaveDisableEnable", Global.YES); - genTable.getOptionMap().put("isHaveDelete", Global.YES); - genTable.getOptionMap().put("isFileUpload", Global.YES); - genTable.getOptionMap().put("isImageUpload", Global.YES); - initGenTableColumn(genTable); - genTableService.save(genTable); - // 子表 - GenTable genTableChild = new GenTable(); - genTableChild.setIsNewRecord(true); - genTableChild.setTableName("test_data_child"); - genTableChild = genTableService.getFromDb(genTableChild); - genTableChild.setIsNewRecord(true); - genTableChild.setClassName("TestDataChild"); - genTableChild.setFunctionAuthor("ThinkGem"); - genTableChild.setTplCategory("crud"); - genTableChild.setPackageName("com.jeesite.modules"); - genTableChild.setModuleName("test"); - genTableChild.setSubModuleName(""); - genTableChild.setFunctionName("测试子表"); - genTableChild.setFunctionNameSimple("数据"); - genTableChild.setParentTableName("test_data"); - genTableChild.setParentTableFkName("test_data_id"); - initGenTableColumn(genTableChild); - genTableService.save(genTableChild); - } - /** - * 代码生成测试数据（列初始化） - */ - private void initGenTableColumn(GenTable genTable){ - for(GenTableColumn column : genTable.getColumnList()){ - if ("test_input".equals(column.getColumnName()) - || "test_textarea".equals(column.getColumnName()) - || "test_select".equals(column.getColumnName()) - || "test_select_multiple".equals(column.getColumnName()) - || "test_checkbox".equals(column.getColumnName()) - || "test_radio".equals(column.getColumnName()) - || "test_date".equals(column.getColumnName()) - || "test_datetime".equals(column.getColumnName()) - ){ - column.setShowType(StringUtils.substringAfter( - column.getColumnName(), "test_")); - if ("test_input".equals(column.getColumnName()) - ){ - column.setQueryType("LIKE"); - } - else if ("test_textarea".equals(column.getColumnName()) - ){ - column.setQueryType("LIKE"); - column.getOptionMap().put("isNewLine", Global.YES); -// column.getOptionMap().put("gridRowCol", "12/2/10"); - } - else if ("test_select".equals(column.getColumnName()) - || "test_select_multiple".equals(column.getColumnName()) - || "test_radio".equals(column.getColumnName()) - || "test_checkbox".equals(column.getColumnName()) - ){ - column.getOptionMap().put("dictType", "sys_menu_type"); - column.getOptionMap().put("dictName", "sys_menu_type"); - } - else if ("test_date".equals(column.getColumnName()) - || "test_datetime".equals(column.getColumnName()) - ){ - column.setQueryType("BETWEEN"); - } - }else if ("test_user_code".equals(column.getColumnName())){ - column.setAttrType("com.jeesite.modules.sys.entity.User"); - column.setFullAttrName("testUser"); - column.setShowType("userselect"); - }else if ("test_office_code".equals(column.getColumnName())){ - column.setAttrType("com.jeesite.modules.sys.entity.Office"); - column.setFullAttrName("testOffice"); - column.setShowType("officeselect"); - }else if ("test_area_code".equals(column.getColumnName())){ - column.setFullAttrName("testAreaCode|testAreaName"); - column.setShowType("areaselect"); - }else if ("test_area_name".equals(column.getColumnName())){ - column.setIsEdit(Global.NO); - column.setIsQuery(Global.NO); - }else if ("test_data_id".equals(column.getColumnName())){ - column.setFullAttrName("testData"); - } - } - } - /** - * 代码生成树表测试数据 - */ - private void initGenTreeData() throws Exception{ - GenTable genTable = new GenTable(); - genTable.setIsNewRecord(true); - genTable.setTableName("test_tree"); - genTable = genTableService.getFromDb(genTable); - genTable.setIsNewRecord(true); - genTable.setClassName("TestTree"); - genTable.setFunctionAuthor("ThinkGem"); - genTable.setTplCategory("treeGrid"); - genTable.setPackageName("com.jeesite.modules"); - genTable.setModuleName("test"); - genTable.setSubModuleName(""); - genTable.setFunctionName("测试树表"); - genTable.setFunctionNameSimple("数据"); - genTable.getOptionMap().put("isHaveDisableEnable", Global.YES); - genTable.getOptionMap().put("isHaveDelete", Global.YES); - genTable.getOptionMap().put("isFileUpload", Global.YES); - genTable.getOptionMap().put("isImageUpload", Global.YES); - genTable.getOptionMap().put("treeViewCode", "tree_code"); - genTable.getOptionMap().put("treeViewName", "tree_name"); - initGenTableColumn(genTable); - genTableService.save(genTable); - } - @Override public int getPhase() { return Integer.MIN_VALUE + 1000; // core 1000, other 2000, upgrade 10000 diff --git a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java index a2c3f4b4..376844b7 100644 --- a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java +++ b/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java @@ -4,10 +4,16 @@ */ package com.jeesite.modules.test.db; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; +import com.jeesite.common.config.Global; +import com.jeesite.common.lang.StringUtils; import com.jeesite.common.tests.BaseInitDataTests; +import com.jeesite.modules.gen.entity.GenTable; +import com.jeesite.modules.gen.entity.GenTableColumn; +import com.jeesite.modules.gen.service.GenTableService; import com.jeesite.modules.gen.utils.GenUtils; /** @@ -25,7 +31,152 @@ public class InitTestData extends BaseInitDataTests { return true; // 如果表已存在，则无需初始化 } runCreateScript("test.sql"); + initGenDemoData(); return true; } + @Autowired + private GenTableService genTableService; + /** + * 代码生成测试数据 + */ + public void initGenDemoData() throws Exception{ + if (!checkTable(GenTable.class)) { + return; + } + if (!checkTable(GenTableColumn.class)) { + return; + } + initGenTestData(); + initGenTreeData(); + } + /** + * 代码生成测试数据 + */ + private void initGenTestData() throws Exception{ + GenTable genTable = new GenTable(); + genTable.setIsNewRecord(true); + genTable.setTableName("test_data"); + genTable = genTableService.getFromDb(genTable); + genTable.setIsNewRecord(true); + genTable.setClassName("TestData"); + genTable.setFunctionAuthor("ThinkGem"); + genTable.setTplCategory("crud"); + genTable.setPackageName("com.jeesite.modules"); + genTable.setModuleName("test"); + genTable.setSubModuleName(""); + genTable.setFunctionName("测试数据"); + genTable.setFunctionNameSimple("数据"); + genTable.getOptionMap().put("isHaveDisableEnable", Global.YES); + genTable.getOptionMap().put("isHaveDelete", Global.YES); + genTable.getOptionMap().put("isFileUpload", Global.YES); + genTable.getOptionMap().put("isImageUpload", Global.YES); + initGenTableColumn(genTable); + genTableService.save(genTable); + // 子表 + GenTable genTableChild = new GenTable(); + genTableChild.setIsNewRecord(true); + genTableChild.setTableName("test_data_child"); + genTableChild = genTableService.getFromDb(genTableChild); + genTableChild.setIsNewRecord(true); + genTableChild.setClassName("TestDataChild"); + genTableChild.setFunctionAuthor("ThinkGem"); + genTableChild.setTplCategory("crud"); + genTableChild.setPackageName("com.jeesite.modules"); + genTableChild.setModuleName("test"); + genTableChild.setSubModuleName(""); + genTableChild.setFunctionName("测试子表"); + genTableChild.setFunctionNameSimple("数据"); + genTableChild.setParentTableName("test_data"); + genTableChild.setParentTableFkName("test_data_id"); + initGenTableColumn(genTableChild); + genTableService.save(genTableChild); + } + + /** + * 代码生成测试数据（列初始化） + */ + private void initGenTableColumn(GenTable genTable){ + for(GenTableColumn column : genTable.getColumnList()){ + if ("test_input".equals(column.getColumnName()) + || "test_textarea".equals(column.getColumnName()) + || "test_select".equals(column.getColumnName()) + || "test_select_multiple".equals(column.getColumnName()) + || "test_checkbox".equals(column.getColumnName()) + || "test_radio".equals(column.getColumnName()) + || "test_date".equals(column.getColumnName()) + || "test_datetime".equals(column.getColumnName()) + ){ + column.setShowType(StringUtils.substringAfter( + column.getColumnName(), "test_")); + if ("test_input".equals(column.getColumnName()) + ){ + column.setQueryType("LIKE"); + } + else if ("test_textarea".equals(column.getColumnName()) + ){ + column.setQueryType("LIKE"); + column.getOptionMap().put("isNewLine", Global.YES); +// column.getOptionMap().put("gridRowCol", "12/2/10"); + } + else if ("test_select".equals(column.getColumnName()) + || "test_select_multiple".equals(column.getColumnName()) + || "test_radio".equals(column.getColumnName()) + || "test_checkbox".equals(column.getColumnName()) + ){ + column.getOptionMap().put("dictType", "sys_menu_type"); + column.getOptionMap().put("dictName", "sys_menu_type"); + } + else if ("test_date".equals(column.getColumnName()) + || "test_datetime".equals(column.getColumnName()) + ){ + column.setQueryType("BETWEEN"); + } + }else if ("test_user_code".equals(column.getColumnName())){ + column.setAttrType("com.jeesite.modules.sys.entity.User"); + column.setFullAttrName("testUser"); + column.setShowType("userselect"); + }else if ("test_office_code".equals(column.getColumnName())){ + column.setAttrType("com.jeesite.modules.sys.entity.Office"); + column.setFullAttrName("testOffice"); + column.setShowType("officeselect"); + }else if ("test_area_code".equals(column.getColumnName())){ + column.setFullAttrName("testAreaCode|testAreaName"); + column.setShowType("areaselect"); + }else if ("test_area_name".equals(column.getColumnName())){ + column.setIsEdit(Global.NO); + column.setIsQuery(Global.NO); + }else if ("test_data_id".equals(column.getColumnName())){ + column.setFullAttrName("testData"); + } + } + } + + /** + * 代码生成树表测试数据 + */ + private void initGenTreeData() throws Exception{ + GenTable genTable = new GenTable(); + genTable.setIsNewRecord(true); + genTable.setTableName("test_tree"); + genTable = genTableService.getFromDb(genTable); + genTable.setIsNewRecord(true); + genTable.setClassName("TestTree"); + genTable.setFunctionAuthor("ThinkGem"); + genTable.setTplCategory("treeGrid"); + genTable.setPackageName("com.jeesite.modules"); + genTable.setModuleName("test"); + genTable.setSubModuleName(""); + genTable.setFunctionName("测试树表"); + genTable.setFunctionNameSimple("数据"); + genTable.getOptionMap().put("isHaveDisableEnable", Global.YES); + genTable.getOptionMap().put("isHaveDelete", Global.YES); + genTable.getOptionMap().put("isFileUpload", Global.YES); + genTable.getOptionMap().put("isImageUpload", Global.YES); + genTable.getOptionMap().put("treeViewCode", "tree_code"); + genTable.getOptionMap().put("treeViewName", "tree_name"); + initGenTableColumn(genTable); + genTableService.save(genTable); + } + }