From 4d44442e530c4ff24bbf3d2e0b2d854cc3778b40 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 3 May 2018 22:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=88=E5=B9=B6=E5=88=B0=E6=A1=86=E6=9E=B6=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 6455 +++++++++++------ modules/core/db/mssql/core.sql | 56 + modules/core/db/mysql/core.sql | 56 + modules/core/db/oracle/core.sql | 96 + modules/core/db/postgresql/core.sql | 96 + modules/core/pom.xml | 7 - .../jeesite/modules/sys/db/InitCoreData.java | 137 + .../resources/views/modules/sys/logForm.html | 2 +- .../org.eclipse.wst.common.component | 3 - web/bin/init-data.bat | 2 +- web/bin/init-data.sh | 2 +- web/db/mssql/core.sql | 56 + web/db/mssql/gen.sql | 71 - web/db/mysql/core.sql | 56 + web/db/mysql/gen.sql | 72 - web/db/oracle/core.sql | 96 + web/db/oracle/create_user.sql | 8 +- web/db/oracle/gen.sql | 116 - web/db/postgresql/core.sql | 96 + web/db/postgresql/gen.sql | 116 - .../java/com/jeesite/test/InitCoreData.java | 2 + .../java/com/jeesite/test/InitGenData.java | 30 - 22 files changed, 4829 insertions(+), 2802 deletions(-) delete mode 100644 web/db/mssql/gen.sql delete mode 100644 web/db/mysql/gen.sql delete mode 100644 web/db/oracle/gen.sql delete mode 100644 web/db/postgresql/gen.sql delete mode 100644 web/src/test/java/com/jeesite/test/InitGenData.java diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 9cc889c7..38c63b9b 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 0 - 104 + 242 + 0 128 128 @@ -231,6 +231,38 @@ area_type character(n) + + a20282cd8e23adbbd4bbeda3ab214076e017ef91 + 200 + null + false + null + false + false + false + + false + JAVA字段名 + 类的属性名 + attr_name + varchar(n) + + + fdf9c3937f0215dcae1a58299485afde19ad799b + 200 + null + false + null + false + false + false + + false + JAVA字段类型 + 类的属性类型 + attr_type + varchar(n) + c138ba567a58d48a0a7a6e7cb56d33c1dc38b17c 1000 @@ -295,6 +327,118 @@ browser_name varchar(n) + + ff1e0ad7d41ac61e908fc5656bdde67a164a6974 + 100 + null + false + null + false + false + false + + false + 实体类名称 + 实体类名称 + class_name + varchar(n) + + + 15ef7eb1eb6b56a4cefc4a85913d8d1d1bbe911a + 50 + null + false + null + false + false + false + + false + + 列标签名 + column_label + nvarchar(n) + + + 9add4a1f079cf3aa4d3da1da358d97f29d976c0d + 64 + null + false + null + false + false + false + + false + 列名 + 列名 + column_name + varchar(n) + + + e8cd4d7657f8c37a71e34f28e71eea3df33bc82f + 10 + null + false + null + false + false + false + + false + 排序（升序） + 列排序（升序） + column_sort + decimal(p) + + + 8ed24661d9998b1972d3eb3f240c93991f1f12d2 + 100 + null + false + null + false + false + false + + false + 类型 + 类型 + column_type + varchar(n) + + + 6f68e29abaf597635078994b33a6f145325f25f6 + 500 + null + false + null + false + false + false + + false + 列说明 + 列备注说明 + comments + nvarchar(n) + + + 079f2c6d89277b4daecbd337e1bf4f781232976a + 500 + null + false + null + false + false + false + + false + 表说明 + 表说明 + comments + nvarchar(n) + 8b9e1b544f371e8c2350ab8926707418a6ea8fdf 64 @@ -1415,6 +1559,70 @@ full_name varchar(n) + + edc273602f2feb54b0d9f060c9414873cf0e46d1 + 50 + null + false + null + false + false + false + + false + 生成功能作者 + 生成功能作者 + function_author + nvarchar(n) + + + dc13101e962883627abb3ca0967353d2d1920ae1 + 200 + null + false + null + false + false + false + + false + 生成功能名 + 生成功能名 + function_name + nvarchar(n) + + + b50c10e77abcb30aa7a0efe2b3a9ef080516967a + 50 + null + false + null + false + false + false + + false + 生成功能名（简写） + 生成功能名（简写） + function_name_simple + nvarchar(n) + + + a7e9e473423331cc2e697d7bad777fab8ea6487a + 1000 + null + false + null + false + false + false + + false + 生成基础路径 + 生成基础路径 + gen_base_dir + nvarchar(n) + 869fc70cf3a4e92e8056b40814df8e03f9f9efde 64 @@ -1431,6 +1639,22 @@ id varchar(n) + + 5d64127594a01a81f482907557646a9765249f61 + 64 + null + false + null + false + false + false + + false + 编号 + 编号 + id + varchar(n) + e2663716e6af40682333d3e8495a04bceff16647 1000 @@ -1463,6 +1687,22 @@ is_attac character(n) + + 1f28b66ae37ff660c2675ba152dee6b728f083d7 + 1 + null + false + null + false + false + false + + false + 是否编辑字段 + 是否编辑字段 + is_edit + character(n) + e889df5da9a251b18e384fc428bb2654cdda9310 1 @@ -1479,6 +1719,38 @@ is_exception character(n) + + ceaed31e30ef442dc589a113de79bd6a81248d78 + 1 + null + false + null + false + false + false + + false + 是否插入字段 + 是否插入字段 + is_insert + character(n) + + + 31a7568881d922441d4dbebe5a6143735995ed3b + 1 + null + false + null + false + false + false + + false + 是否列表字段 + 是否列表字段 + is_list + character(n) + 5224ef38946585af8ba22f294756ffaecb434ddc 1 @@ -1495,6 +1767,54 @@ is_merge_push character(n) + + e0da8eabac4712b66e3cf284f8be5a8533c31220 + 1 + null + false + null + false + false + false + + false + 是否可为空 + 是否可为空 + is_null + character(n) + + + d7c4eca9ef06061ed7759b05cd050ef4b8c2111e + 1 + null + false + null + false + false + false + + false + 是否主键 + 是否主键 + is_pk + character(n) + + + 5174c7a0354ffa29e89aacf71d1b96e56f78b1fb + 1 + null + false + null + false + false + false + + false + 是否查询字段 + 是否查询字段 + is_query + character(n) + a5e7e1443b21fe207b79ab4300b2ab90bc8a69ea 1 @@ -1559,6 +1879,22 @@ is_sys character(n) + + 0d830d7889e57b255de5bb649e4f13fc1c369c86 + 1 + null + false + null + false + false + false + + false + 是否更新字段 + 是否更新字段 + is_update + character(n) + 728962f9a8c15fa620380b1e8bbb54a9b386ce72 200 @@ -2039,6 +2375,22 @@ module_name varchar(n) + + ce338c590e6e91ae174e1728177e527d1fb5a1f8 + 30 + null + false + null + false + false + false + + false + 生成模块名 + 生成模块名 + module_name + varchar(n) + 98eb079aebd2f56c461cb92d97ab4d56f603b840 null @@ -2151,6 +2503,38 @@ office_type character(n) + + 688b0f7ac0036d32e75f7da7a74d307c976be2ab + 1000 + null + false + null + false + false + false + + false + 其它生成选项 + 其它生成选项 + options + nvarchar(n) + + + 705ceee9c058659c1509ef35e6cdd1bedc4422c4 + 500 + null + false + null + false + false + false + + false + 生成包路径 + 生成包路径 + package_name + varchar(n) + b18ce64a2a72d00b26515583d8bbfea282f30ea8 64 @@ -2183,6 +2567,38 @@ parent_codes varchar(n) + + 7302decf65cd29ade7edd5a42ef629938c70f45c + 64 + null + false + null + false + false + false + + false + 本表关联父表的外键名 + 本表关联父表的外键名 + parent_table_fk_name + varchar(n) + + + 03fa62677d146f929436f5b658fec1d454ec0adc + 64 + null + false + null + false + false + false + + false + 关联父表的表名 + 关联父表的表名 + parent_table_name + varchar(n) + 1c4770699874e998061aa859fad20a30e288e49f 100 @@ -2567,6 +2983,22 @@ pwd_update_record varchar(n) + + b51b6ef27d586f8267bfd6bbf27a0858e129fd8d + 200 + null + false + null + false + false + false + + false + 查询方式 + 查询方式 + query_type + varchar(n) + 6aebba19b24d1792a8b1e8a03ad43af4eb0b6ad3 null @@ -2951,6 +3383,22 @@ sex character(n) + + ab96e97ea0fa572ae6c746aec5e8dd94569f053a + 200 + null + false + null + false + false + false + + false + 表单类型 + 表单类型 + show_type + varchar(n) + 4551bd6ffaf84e43ffaaf7fa7ec5a46c37935f24 200 @@ -3063,6 +3511,22 @@ status character(n) + + 58ee1b25a309334f43edd0e3695be10addd71571 + 30 + null + false + null + false + false + false + + false + 生成子模块名 + 生成子模块名 + sub_module_name + varchar(n) + e0509c4cf92246c64c1f44892e866378cec1ee30 64 @@ -3079,6 +3543,38 @@ sys_code varchar(n) + + f53f151fcfc0c5008da4d5314a50ef425a61c482 + 64 + null + false + null + false + false + false + + false + 表名 + 表名 + table_name + varchar(n) + + + 3c113dc08971de6b9b524afdcb41a1562f130081 + 200 + null + false + null + false + false + false + + false + 生成模板分类 + 使用的模板 + tpl_category + varchar(n) + 87c323ed50d7e952c195d1d2cfac3aaa1cc8c064 null @@ -3452,13 +3948,13 @@ - aff965a3c67317a340ec0e43af2f3ef7f3f2b3c8 + 34f0a85afc639279defd9dac7e4663423501949386296Segoe UI9 - 225 - 1740 + 81 + 1615 128 128 @@ -3466,9 +3962,9 @@ - 746fe50735123e759970f4235c5a7b18fde0e205 - fbddb203edfde98403ee9e60374f71e993a8f879 - aff965a3c67317a340ec0e43af2f3ef7f3f2b3c8 + 8ab9447336d560c3f98f5f8c71f0f4beced7448c + 88f2a6b49290f5f6cf1ab815f457af00f9ef9334 + 34f0a85afc639279defd9dac7e46634235019493 -1 -1 -1 @@ -3488,9 +3984,9 @@ null - cc2d9d9bee1b436e88d7cebd27690b991a998f7d - d8b7ee2b5b212db5d77eaf3da4c408bba6fbc4c4 - aff965a3c67317a340ec0e43af2f3ef7f3f2b3c8 + 15cb00bea2d3dfcd4f724b9c1998bb4e05f113ca + 02fa10da8a8129b3127d0eb5e94a0205ba909d75 + 34f0a85afc639279defd9dac7e46634235019493 -1 -1 -1 @@ -3520,7 +4016,7 @@ 23ffaff951e2a129327ee9c1adbd27093924b4f4 5ac7f3a7a755a58e6119c8d4922df644559e632f - 746fe50735123e759970f4235c5a7b18fde0e205 + 8ab9447336d560c3f98f5f8c71f0f4beced7448c @@ -3554,7 +4050,7 @@ 79c510b01e27862264aa98b183ba8fce4b97ecab 512f24dbe486a211117dfb58e689ef3e0e5009a0 - cc2d9d9bee1b436e88d7cebd27690b991a998f7d + 15cb00bea2d3dfcd4f724b9c1998bb4e05f113ca @@ -3595,13 +4091,13 @@
- 2550a297f2c8a4dcf52dd8c60fe213f9f57bc41f + c80ea58252748207dc3658837dc7c28c17ea228286277Segoe UI9 - 2556 - 1236 + 2144 + 1111 128 128 @@ -3609,9 +4105,9 @@ - 3199e2d8756c707bc35e0161775452e2b430d445 - 7e9fd1e567158216fe2e59dd4c752fe641ccadf3 - 2550a297f2c8a4dcf52dd8c60fe213f9f57bc41f + 36e1930616222a72cbc003f5062cd8b5bc419dec + e41d6d92570eebf1f74e66c34917798f6b1167d5 + c80ea58252748207dc3658837dc7c28c17ea2282 -1 -1 -1 @@ -3631,9 +4127,9 @@ null - c4ab044c8521a451e709fd3d296cfaa28d4b5e0f - 533a82ad7913d3e0df58819be6c38a5f3fc3da9c - 2550a297f2c8a4dcf52dd8c60fe213f9f57bc41f + 105a3e40a8ed65af19f583fd50bdd7a8cc51b059 + 7ef4520149693e59bda4b4f9a5d096b6e67a7097 + c80ea58252748207dc3658837dc7c28c17ea2282 -1 -1 -1 @@ -3663,7 +4159,7 @@ 136c2841a88ba120cd1f0bb13f7ba446474de69e 22d38cfee95536d3e3af5fdd444b027a85d95432 - c4ab044c8521a451e709fd3d296cfaa28d4b5e0f + 105a3e40a8ed65af19f583fd50bdd7a8cc51b059 @@ -3697,7 +4193,7 @@ 1882f53a36409270c8622486740876fcb2af9842 e84c40cdf5ffdb2ba4d59630d98abb5972d74795 - 3199e2d8756c707bc35e0161775452e2b430d445 + 36e1930616222a72cbc003f5062cd8b5bc419dec @@ -3738,13 +4234,13 @@
- 62d952009068c09d15dd9eba5eeff40743da13de + c473b31c5c5bc7454779a303adde455752fb6b1786274Segoe UI9 - 2175 - 300 + 1697 + 168 128 128 @@ -3752,9 +4248,9 @@ - 892c4d0bf08042963d7a6e5ff90f39ea1ca040b9 - 533a82ad7913d3e0df58819be6c38a5f3fc3da9c - 62d952009068c09d15dd9eba5eeff40743da13de + 14bf9106ecbc1732a2659abad4d82cd8e017a47e + 7ef4520149693e59bda4b4f9a5d096b6e67a7097 + c473b31c5c5bc7454779a303adde455752fb6b17 -1 -1 -1 @@ -3774,9 +4270,9 @@ null - b126c505f715ae640bec1a8ca9e2a4512fb567f2 - 1429d1821686172226fa74320797653f13706b88 - 62d952009068c09d15dd9eba5eeff40743da13de + 78d4361535bbd4df5baed85f25c865fd10ef48bd + 0ded13a505cc3bfde24edfbae369231be192a59b + c473b31c5c5bc7454779a303adde455752fb6b17 -1 -1 -1 @@ -3806,7 +4302,7 @@ 537ed3a5e139d1fed26b9011d93c339510cda1f7 e59481cc0025d4da3d55201ee470c33b2c12a575 - b126c505f715ae640bec1a8ca9e2a4512fb567f2 + 78d4361535bbd4df5baed85f25c865fd10ef48bd @@ -3840,7 +4336,7 @@ ffde396c7b349d700fe1b7891694ac538d00bf6d 22d38cfee95536d3e3af5fdd444b027a85d95432 - 892c4d0bf08042963d7a6e5ff90f39ea1ca040b9 + 14bf9106ecbc1732a2659abad4d82cd8e017a47e @@ -3881,13 +4377,13 @@
- 4f54fe220fa2eb538e9648b938feb7dbe8f5ec18 + fa8e34c8edd10753e33b7d24041aab90853103be128352Segoe UI9 - 2064 - 1284 + 1652 + 1159 128 128 @@ -3895,9 +4391,9 @@ - 55724bc9a21af1804ca9cfff37a9cd502685366e - 1429d1821686172226fa74320797653f13706b88 - 4f54fe220fa2eb538e9648b938feb7dbe8f5ec18 + 7e44ec4629d57ddc055fe2ec687488e72bc26da3 + 0ded13a505cc3bfde24edfbae369231be192a59b + fa8e34c8edd10753e33b7d24041aab90853103be -1 -1 -1 @@ -3927,7 +4423,7 @@ 0d5ebb11e5172fb4a9e1b4b2e62140432e0cd3ff e59481cc0025d4da3d55201ee470c33b2c12a575 - 55724bc9a21af1804ca9cfff37a9cd502685366e + 7e44ec4629d57ddc055fe2ec687488e72bc26da3 控制用户编码 @@ -4066,962 +4562,14 @@
- - 6b13e8bd8236b5487a4bb3f7c77e832fe6be5b44 - 128 - 352 - Segoe UI - 9 - 2136 - 1068 - - 128 - 128 - 192 - - - - 340563ad69ba11f0f5e6cbdc0a76869d5f6c2386 - 533a82ad7913d3e0df58819be6c38a5f3fc3da9c - 6b13e8bd8236b5487a4bb3f7c77e832fe6be5b44 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_role_data_scope - 角色数据权限表 - - - - - - - 7e2f59707205419c8556876dc854aeff0fbf7b57 - 22d38cfee95536d3e3af5fdd444b027a85d95432 - 340563ad69ba11f0f5e6cbdc0a76869d5f6c2386 - - - 控制角色编码 - - varchar(n) - - - false - true - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - df33cf2fa1349df70c9c48ac3a90b92a146224ed - 0584b59447729b3b369483353308793591c2c407 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 69bed3e42a9bbab83f7eb519e2786edc22260fd4 - 0f7661178a7a9832b2b97169c49191338e769f6e - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 286b8f3e3671588da8693a150d1c611ff0634dcf - db19c839b454a19a52e46cd7cbd9b0ba9dd8949c - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - - - - - - - -
- - f85cba0c5d6c990bc7a5702474874494d2b53ec3 - 254 - 288 - Segoe UI - 9 - 1836 - 1980 - - 128 - 128 - 192 - - - - js_sys_config - 参数配置表 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - f6060612c049709042d4157e4e40e81bd0321afe - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - ee84723c8bde13d17589d3a0059e969a54af1a76 - e0f7d2c8f9db92fbc2ae5ac0fb1d0de34b8789f2 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 3bd475d905295b18837332926f66deacf286f563 - 807d1ffdb87bb0bd9cc5211997e18efc06db6624 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a49b2ebdb0ca593f13c432eb28d1bbfe109c1421 - c97cf10bf385b6b91e85108039b1a55d55fbde2e - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7feb27963741f108bd29ccf401a0f25ec6f588ff - 55bd63033160c21ac6e79051e3ea58f1bde0cac7 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_config_key - - - - - 807d1ffdb87bb0bd9cc5211997e18efc06db6624 - false - - - - - - - - - -
- - f9d8784eafb05308024bf6fbbad5640eabe70129 - 296 - 320 - Segoe UI - 9 - 1445 - 1971 - - 128 - 128 - 192 - - - - js_sys_module - 模块表 - - - - - - - 446f3cd3b9b1dd50fa5989a256c401a193a3706c - d964f7c50e480b77047f79d1107c95d0bbe9717c - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2f27eb5025ffc1dddc8dd8f526bc9ba3fddd976b - 4c086c0ba92da3a70e70b9771d6af64841cc5080 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f7114401c278a134ec74f1836c0f4afeed91cf0f - 9d82192f942304d0060c53ac9a03769df6797ff0 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a349e3aeee90969e1e0c7f6ad8481b209eb691f3 - 35d6215c6b80d8640b1632e1b8b2139f10d0cec1 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f1196b5a1e9072ac4cc990c913b774e777b09a46 - 33577148015618b442b625836cf90ba27ace9621 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cc6e1b3ebd5a36ac1f844bc246537c6f1e99c3af - 6281abb4d5813839a39d7d75ce39843c4467c390 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - - - - false - true - idx_sys_module_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - - - - - -
- - e991c3c26f1883475a23693afa7c3cd6a4cef394 - 317 - 356 - Segoe UI - 9 - 672 - 1980 - - 128 - 128 - 192 - - - - js_sys_job - 作业调度表 - - - - - - - 70abca97f16eab0d562a2104ec1a0ede326b1c46 - 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2fe17467ad48944f125de4abf28e973234a9bcb4 - 443772d4627c23aef484c324c8e431121b921a44 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 - 225e6d868b8d45320dc7f79db6296db64985b308 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2663716e6af40682333d3e8495a04bceff16647 - c5abf897611d8a927582d1dcb3deceef5c164614 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 - d8ece7f15423d813de0dc100fa1c67e047ca4a08 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 44ce4edd5ad45896934d6f90f14af5884b98ba5b - 7041a843a37e89ce935ad9309fa1a3b2548920e5 - - - - - decimal(p) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261aca14bc2dd0bef97fa78a1256a95b5cb94171 - 91c2e73c20940e4a715ffb02148e2f3a1bb72334 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 481c1a6225e0f2a86dbf4f752e9455afac57f897 - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_job_status - - - - - 644c88074f6f9cbe4b29b12b9633f4e238a2761b - false - - - - - - - - - -
- d3c8f931c968489a14e2fb958b6a376a6a5dd685 + e3da82fc4c0d30588907db840ae63a7332c1e067 108 295 Segoe UI 16 - 790 - 204 + 526 + 72 128 128 @@ -5032,13 +4580,13 @@ JeeSite 4.0 Module Core http://jeesite.com - a443db2b6bd015cbc3feb9d38226622dbb850963 + 1ad7d49c076378b65c36381a9ffcffe992e6598f86276Segoe UI9 - 804 - 385 + 542 + 249 128 128 @@ -5046,9 +4594,9 @@ - 8eae392ce824a9d5de09e23ff2e970364a81a3ab - f28f824baf21270b29ed2ce3406dc72ea0993578 - a443db2b6bd015cbc3feb9d38226622dbb850963 + b0f5908adf750e38a8bea21b03603ed2333f5172 + 332663a620f7368821829bbc8702a2be1e2f45d4 + 1ad7d49c076378b65c36381a9ffcffe992e6598f -1 -1 -1 @@ -5068,9 +4616,9 @@ null - 6034c8da2874bb09f87e97a5ff314631225ea903 - 42ecdc4f84d453e9c411183238bdb3fcef97aeee - a443db2b6bd015cbc3feb9d38226622dbb850963 + 35b8f04adc3ee859595a19eafa2d374ed7454376 + 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6 + 1ad7d49c076378b65c36381a9ffcffe992e6598f -1 -1 -1 @@ -5100,7 +4648,7 @@ 2f7bbb8699e51f6ae50ccbab765f8de4a402cad2 ab8b402ea35a78cdadd5ed446d571c9a80b532ee - 8eae392ce824a9d5de09e23ff2e970364a81a3ab + b0f5908adf750e38a8bea21b03603ed2333f5172 @@ -5134,7 +4682,7 @@ c06047702cc26617e350accac3afdbb589cf5cf4 ed19c91e49d39e19cffec01c77c369cd2ea1c989 - 6034c8da2874bb09f87e97a5ff314631225ea903 + 35b8f04adc3ee859595a19eafa2d374ed7454376 @@ -5175,13 +4723,13 @@
- 6fb59044432ca4a75452080734843f8e2ecc351e + 7ab826cc0649ad2e00abee7f8cf074e26259e32d254330Segoe UI9 - 3288 - 420 + 2820 + 210 128 128 @@ -5365,13 +4913,13 @@
- 3c6468f5248844d66d20edf912dc1cca68e04051 + 6ce90f0c465f8e4480cf489e2f1cfcb423be63d9170332Segoe UI9 - 2544 - 1536 + 2172 + 1491 128 128 @@ -5620,13 +5168,13 @@
- 946125b4f4f238f3cca2cc7e1450150e8358e30e + fb333ffb0b8e61a5fb0220a5859db30d4da93c83380323Segoe UI9 - 1428 - 1500 + 1016 + 1375 128 128 @@ -5817,439 +5365,13 @@
- d1781269b030dbffd605d2463067e6eb7150cc94 - 947 - 324 - Segoe UI - 9 - 3780 - 84 - - 128 - 128 - 192 - - - - 9109c187e2865854e84bd5222da6c11137ecf90a - 6fb59044432ca4a75452080734843f8e2ecc351e - d1781269b030dbffd605d2463067e6eb7150cc94 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - false - - RESTRICT - RESTRICT - 4f8af0766a0ba0866db74d9fe750581d1eefea91 - null - - - js_sys_dict_data - 字典数据表 - - - - - - - 32c7f5bb206f025610dd8211c6d397ee4845f3a3 - 424e7476db4a216fdf3eee470ce921c356f07e5e - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - 9ca0e5536ea6174629b791183977dcc92c13f908 - 396fee69de4e5229fae2bbdd0501e98cb740bfe5 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cc294effb178877401baf60d266faff21b80c5ea - 99f4c815f19a4256e44625dac3423eaba8f23da1 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 - 4f8af0766a0ba0866db74d9fe750581d1eefea91 - 9109c187e2865854e84bd5222da6c11137ecf90a - - - - - varchar(n) - - - false - true - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7feb27963741f108bd29ccf401a0f25ec6f588ff - 0baae707c361b3286955f0587b34476fd4f36cfd - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b3d67ac6d9320b61db546035ec7c8e487fd8a9c4 - 41906c8f63b3a63fb41393d75e45d10a247e492d - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1310f67a2772a72e48216c23deb7f7e7ef6f0041 - 645203ee29b1ee73a7f0d5e9878b4227a8b7302c - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1f24bfd07483cf3e59f6ecbd4966755d9670df74 - ac7e17e899d099929e517e74f7a116c939840895 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_dict_data_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_dict_data_dt - - - - - 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 - false - - - - - false - true - idx_sys_dict_data_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_dict_data_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_dict_data_pcs - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_dict_data_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_dict_data_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - false - true - idx_sys_dict_data_dv - - - - - 99f4c815f19a4256e44625dac3423eaba8f23da1 - false - - - - - - - - - -
- - ed6e8a432857e3c91439ba08919427242445da8d + 8ba06f49c4e33f5e6bcd806db039e68348de258e296466Segoe UI9 - 1980 - 1500 + 1572 + 1428 128 128 @@ -6257,9 +5379,9 @@ - 08573934413ee3cf9276b5f5ce6db650f8ca51fc - 3c6468f5248844d66d20edf912dc1cca68e04051 - ed6e8a432857e3c91439ba08919427242445da8d + 33478cb70ea02c234bfebbb81fb8fccfbbadde14 + 6ce90f0c465f8e4480cf489e2f1cfcb423be63d9 + 8ba06f49c4e33f5e6bcd806db039e68348de258e -1 -1 -1 @@ -6322,7 +5444,7 @@ fc44d466dd6009e48b5222d1d71e38d025194ff0 54b86f255d95078898534902087fb704b4265b60 - 08573934413ee3cf9276b5f5ce6db650f8ca51fc + 33478cb70ea02c234bfebbb81fb8fccfbbadde14 @@ -6587,13 +5709,13 @@
- d8b7ee2b5b212db5d77eaf3da4c408bba6fbc4c4 + 02fa10da8a8129b3127d0eb5e94a0205ba909d75989338Segoe UI9 - 203 - 588 + 59 + 463 128 128 @@ -7056,13 +6178,13 @@
- 533a82ad7913d3e0df58819be6c38a5f3fc3da9c + 7ef4520149693e59bda4b4f9a5d096b6e67a7097359 - 447 + 452Segoe UI9 - 2088 - 600 + 1610 + 468 128 128 @@ -7372,13 +6494,13 @@
- 5a55f28ca4981311f4dace00ee7a95458ae7e556 + a66af690ade469b3b4b472b1680bdc1923d5c972191437Segoe UI9 - 3780 - 1383 + 3438 + 2076 128 128 @@ -7386,9 +6508,9 @@ - e09e1c696eeab068658a8e23d0521c7bad167640 - 06bec351d8370028d7d476207a365f62c2774461 - 5a55f28ca4981311f4dace00ee7a95458ae7e556 + 490e64525fdda2a1a541f1db1771664f9a100502 + 519d64ec10e7c0df51e0b14489d6666c04b93e34 + a66af690ade469b3b4b472b1680bdc1923d5c972 -1 -1 -1 @@ -7451,7 +6573,7 @@ f385f23b1163beb8b239a67f5a262c83fb46cae6 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 - e09e1c696eeab068658a8e23d0521c7bad167640 + 490e64525fdda2a1a541f1db1771664f9a100502 所属消息 所属消息 @@ -7722,13 +6844,13 @@
- 686dfbc518ac9540049104cbfdaaed1c7d46ab2e + a6c608c6e251fcd0abdda6ac92248c3955fccc20254287Segoe UI9 - 2232 - 1971 + 3840 + 810 128 128 @@ -7945,13 +7067,13 @@
- 7e9fd1e567158216fe2e59dd4c752fe641ccadf3 - 968 + e41d6d92570eebf1f74e66c34917798f6b1167d5 + 989511Segoe UI9 - 2652 - 132 + 2172 + 12 128 128 @@ -8492,13 +7614,13 @@
- a7747e8ed06cfd1d77c15b7ce77082d651c45bfe + aa451fd851089815b9061a85e8abe249ff24b3ce296320Segoe UI9 - 2750 - 1938 + 2712 + 1381 128 128 @@ -8761,572 +7883,13 @@
- 06bec351d8370028d7d476207a365f62c2774461 - 443 - 484 - Segoe UI - 9 - 3024 - 1257 - - 128 - 128 - 192 - - - - js_sys_msg_inner - 内部消息 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - a304841afc9968e7c8768979fe2ba3f2f315db78 - cbbb279fbb0f0ea5d67536332ce7d9a8b3d70e36 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a654ac8de54e8c19cfdba4bcf6d636ab760799b9 - 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 31410c3d884588423ca2a5803e78d0934412f458 - 10a8ef0d67bd3c9a90e9c67dc86953fefb8f8755 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 98eb079aebd2f56c461cb92d97ab4d56f603b840 - 48bf7c9cb90d62b9cba0283d51bf94980e9fea92 - - - - - clob - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a70dd4133cc6302307f8a0ac828a6049c401db58 - 5b256d59f963bf2a76cf35c847634b1188154874 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5797ae3ca5da40a8a45dfd0071f3589585c2517f - fe9b7e3236d284db50cb1d4cda9a77d1d8de40d2 - - - - - clob - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 86b915810d6436eb5c60062abbe4f8910c86f89c - b21a2db1cf685edc44c2bf252785aabc4cfb0794 - - - - - clob - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - c5364fcf3327275d038d229e22f80ce97c28d402 - b0959f0c2f737aa49188e57cc71afb3242e9e97b - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 949f48cec7229094875af06d5c3ee4e7efbba1e0 - 8d09d0b4b174964fb858b7ccb77ed9e14767de65 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5e197b7f106763a6952e72203fcc902cea793853 - d492c41633035ed8c33c89c5c704ef2dd5d7d32c - - - - - datetime - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - da74a37a1025119cd79a05644781c76b606352d3 - 0390e069a393fa7b2f2de0531b12470c299317f8 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 81e89a36c985a9f69710177677cd7be6ed6ea089 - fd262e1d867fb854931a86728233eec74fc0099b - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 20092a8f08bbf1304383014693172e4fc863277d - 6d885df5f4956aeb6b228e769b8d037459d7a7d7 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - - - - false - true - idx_sys_msg_inner_cb - - - - - e5355faba5ec3c9128507dd4c48ea9230631cf83 - false - - - - - false - true - idx_sys_msg_inner_status - - - - - 6d885df5f4956aeb6b228e769b8d037459d7a7d7 - false - - - - - false - true - idx_sys_msg_inner_cl - - - - - 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe - false - - - - - false - true - idx_sys_msg_inner_sc - - - - - b0959f0c2f737aa49188e57cc71afb3242e9e97b - false - - - - - false - true - idx_sys_msg_inner_sd - - - - - d492c41633035ed8c33c89c5c704ef2dd5d7d32c - false - - - - - - - - - -
- - 5073939d7dbd96d0da1b7879a566895d90f29624 + 7288725d60b2b38243916c16fff2182600568057506419Segoe UI9 - 3840 - 1825 + 3780 + 1279 128 128 @@ -10207,13 +8770,13 @@
- 332ac990d4a8e4dd77ca650d230c9f1deedee83b + 9ab9e19921654f64fedac3e4a117a6109afc4e41506419Segoe UI9 - 3228 - 1825 + 3180 + 1279 128 128 @@ -11094,13 +9657,13 @@
- d666c509d068f3dabf0fba21897bba87ecd883c4 - 170 + ab8aa0c74f805f347640da80d9266971cc53ca68 + 233269Segoe UI9 - 1112 - 2034 + 1390 + 2004 128 128 @@ -11108,9 +9671,9 @@ - dcb09f95b0ac0ddaef78794ac3fa636075cc7152 - e991c3c26f1883475a23693afa7c3cd6a4cef394 - d666c509d068f3dabf0fba21897bba87ecd883c4 + f90d1c736ab0f8a81bd0c03fc850c22ff3e723a3 + 3f27d1586b2cd7849b9ae30883c1191ade8f874c + ab8aa0c74f805f347640da80d9266971cc53ca68 -1 -1 -1 @@ -11173,7 +9736,7 @@ 6d5f3e5ef4d28e57966c33c4b4ef424f1dc42b7b 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 - dcb09f95b0ac0ddaef78794ac3fa636075cc7152 + f90d1c736ab0f8a81bd0c03fc850c22ff3e723a3 @@ -11207,7 +9770,7 @@ 91110163a8a31ee61a4153360707026b5498dd65 443772d4627c23aef484c324c8e431121b921a44 - dcb09f95b0ac0ddaef78794ac3fa636075cc7152 + f90d1c736ab0f8a81bd0c03fc850c22ff3e723a3 @@ -11511,13 +10074,13 @@
- 2074919cbcf9f3c311ec3d7e27d331e2a3cfa883 - 443 + aa6ae2d293a0dd15afc239a828d16ac8627a30fe + 506338Segoe UI9 - 204 - 1908 + 3828 + 108 128 128 @@ -12294,327 +10857,13 @@
- fbddb203edfde98403ee9e60374f71e993a8f879 - 863 - 338 - Segoe UI - 9 - 790 - 1037 - - 128 - 128 - 192 - - - - 1b0ca6438eaa1bbc9b5d9d3a57bcaea05f3c517e - 946125b4f4f238f3cca2cc7e1450150e8358e30e - fbddb203edfde98403ee9e60374f71e993a8f879 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 0..1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_company - 公司表 - - - - - - - 8b9e1b544f371e8c2350ab8926707418a6ea8fdf - 5ac7f3a7a755a58e6119c8d4922df644559e632f - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - 5574844cb0d58e6bdfa1ca122c6cca8c5b27602a - 7c46717b372c8596c8138ff412b0363bea79262f - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f0f47249781a8c1e655ae11236426b788f099fce - bb54ac3b2667504dc519cb88904db1337b64704e - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cc2d46a644ef882366305e786927e310dc7945cb - 0bc7917672103a43ef4220fe999083a392356666 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - bdc9f61f5a7bd4a53e05d939ea82f9885c78eb01 - 84fb98359c82f62d61719d8ce1d1f850d69d972f - 1b0ca6438eaa1bbc9b5d9d3a57bcaea05f3c517e - - - - - varchar(n) - - - false - true - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_company_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_company_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_company_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_company_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_company_vc - - - - - 7c46717b372c8596c8138ff412b0363bea79262f - false - - - - - false - true - idx_sys_company_pcs - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_company_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - - - - - -
- - f28f824baf21270b29ed2ce3406dc72ea0993578 + 332663a620f7368821829bbc8702a2be1e2f45d4359361Segoe UI9 - 761 - 564 + 499 + 428 128 128 @@ -12622,9 +10871,9 @@ - 5d4e8745b2660e2a5494cd668f6573a85d938f4d - fbddb203edfde98403ee9e60374f71e993a8f879 - f28f824baf21270b29ed2ce3406dc72ea0993578 + 2e60e9a0dc11b3f703a3dbb5acca4f46fe110028 + 88f2a6b49290f5f6cf1ab815f457af00f9ef9334 + 332663a620f7368821829bbc8702a2be1e2f45d4 -1 -1 -1 @@ -12644,9 +10893,9 @@ null - 5f7b730666b316238ee57aef6dde62da05a3f657 - d8b7ee2b5b212db5d77eaf3da4c408bba6fbc4c4 - f28f824baf21270b29ed2ce3406dc72ea0993578 + dbbcac951777ac31dfb86dbf12230e2428179bd1 + 02fa10da8a8129b3127d0eb5e94a0205ba909d75 + 332663a620f7368821829bbc8702a2be1e2f45d4 -1 -1 -1 @@ -12775,7 +11024,7 @@ b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c 512f24dbe486a211117dfb58e689ef3e0e5009a0 - 5f7b730666b316238ee57aef6dde62da05a3f657 + dbbcac951777ac31dfb86dbf12230e2428179bd1 @@ -12842,7 +11091,7 @@ 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d 5ac7f3a7a755a58e6119c8d4922df644559e632f - 5d4e8745b2660e2a5494cd668f6573a85d938f4d + 2e60e9a0dc11b3f703a3dbb5acca4f46fe110028 @@ -13016,13 +11265,13 @@
- 1429d1821686172226fa74320797653f13706b88 + 0ded13a505cc3bfde24edfbae369231be192a59b1283520Segoe UI9 - 1380 - 161 + 968 + 36 128 128 @@ -13030,9 +11279,9 @@ - dbe9a93069bf3403fc0995a57cc79c5699f601d4 - f28f824baf21270b29ed2ce3406dc72ea0993578 - 1429d1821686172226fa74320797653f13706b88 + 6bd33b5140f2ac883b069f643af24099f14d4bf1 + 332663a620f7368821829bbc8702a2be1e2f45d4 + 0ded13a505cc3bfde24edfbae369231be192a59b -1 -1 -1 @@ -13491,7 +11740,7 @@ f22a1cfec76101d87da3a951bb05d7700418c1c1 ab8b402ea35a78cdadd5ed446d571c9a80b532ee - dbe9a93069bf3403fc0995a57cc79c5699f601d4 + 6bd33b5140f2ac883b069f643af24099f14d4bf1 用户类型引用编号，例如如：当user_type为1员工的时候，ref_code关联的为emp_code 用户类型引用编号 @@ -14285,13 +12534,13 @@
- 42ecdc4f84d453e9c411183238bdb3fcef97aeee + 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6296373Segoe UI9 - 180 - 161 + 36 + 36 128 128 @@ -14488,6 +12737,3446 @@
+ + 9915937d4e3e8e237226fc9f049c585b793dc190 + 443 + 308 + Segoe UI + 9 + 526 + 1968 + + 128 + 128 + 192 + + + + c74f1c12036a04e6a3bcb807cf8017539ee11513 + f9c5f9ef3226c5e4a275d1e0be09e8d6a4bbf098 + 9915937d4e3e8e237226fc9f049c585b793dc190 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_gen_table_column + 代码生成表列 + + + + + + + 5d64127594a01a81f482907557646a9765249f61 + 01e9845d82f2f560da299a243b82c82c4d5b9323 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + abd5fc5f0bb213daae3de2abc362c5aea5276f4d + a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 + c74f1c12036a04e6a3bcb807cf8017539ee11513 + + + + + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 9add4a1f079cf3aa4d3da1da358d97f29d976c0d + 0d9c0d7416e02ee2fd019e6dc7537ccdf7a518cc + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e8cd4d7657f8c37a71e34f28e71eea3df33bc82f + 79241381fe1e3549e1434c88d56601520a46392a + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8ed24661d9998b1972d3eb3f240c93991f1f12d2 + 8043f3b4e6daa792a13f5ce5b6319c7caa60a72e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 15ef7eb1eb6b56a4cefc4a85913d8d1d1bbe911a + 187b877adbbc84967fd4c90a10dbea94de5e3b15 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6f68e29abaf597635078994b33a6f145325f25f6 + 39b8368fae934c7104ba0343a6816e49e03a156d + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a20282cd8e23adbbd4bbeda3ab214076e017ef91 + 4319d4fdb713f50e8d83a1f09d7945d7683dd916 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + fdf9c3937f0215dcae1a58299485afde19ad799b + 4cf8e4f7ab7021ee40f486cdf78f3da437b73e16 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + d7c4eca9ef06061ed7759b05cd050ef4b8c2111e + aae6788ed8ece4f35eabce00e75e788011d25d83 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e0da8eabac4712b66e3cf284f8be5a8533c31220 + 78d018f3284fe0ef2b71c4021fa8a3c8848436ed + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ceaed31e30ef442dc589a113de79bd6a81248d78 + 47fed38931fcb8074fc07611fb49159af52e4b96 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 0d830d7889e57b255de5bb649e4f13fc1c369c86 + cd2bc61372e843b703bb36608cb58be277490a8a + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 31a7568881d922441d4dbebe5a6143735995ed3b + 4651283ace05a6d80c5bec1ef610652216d21f84 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5174c7a0354ffa29e89aacf71d1b96e56f78b1fb + 39d25d5df5b30a2486b7c492fdfee3bac08cddeb + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b51b6ef27d586f8267bfd6bbf27a0858e129fd8d + c4a768c9651f672727c4e10b81630aacab28e297 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1f28b66ae37ff660c2675ba152dee6b728f083d7 + 8132085f47b3d204c18ba3e2aa249225cb37d9b2 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ab96e97ea0fa572ae6c746aec5e8dd94569f053a + f97e35c4ba758bb04138029605d0525d59786d62 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 688b0f7ac0036d32e75f7da7a74d307c976be2ab + 41b1918e7b74391852096cc8a204eba329cfb721 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + false + true + idx_gen_table_column_tn + + + + + + + + + + + +
+ + 88f2a6b49290f5f6cf1ab815f457af00f9ef9334 + 884 + 338 + Segoe UI + 9 + 528 + 901 + + 128 + 128 + 192 + + + + 790d80cf4b6dc7fa405d9712e3e0ac8a3d3256d2 + fb333ffb0b8e61a5fb0220a5859db30d4da93c83 + 88f2a6b49290f5f6cf1ab815f457af00f9ef9334 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 0..1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_company + 公司表 + + + + + + + 8b9e1b544f371e8c2350ab8926707418a6ea8fdf + 5ac7f3a7a755a58e6119c8d4922df644559e632f + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 5574844cb0d58e6bdfa1ca122c6cca8c5b27602a + 7c46717b372c8596c8138ff412b0363bea79262f + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0f47249781a8c1e655ae11236426b788f099fce + bb54ac3b2667504dc519cb88904db1337b64704e + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cc2d46a644ef882366305e786927e310dc7945cb + 0bc7917672103a43ef4220fe999083a392356666 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + bdc9f61f5a7bd4a53e05d939ea82f9885c78eb01 + 84fb98359c82f62d61719d8ce1d1f850d69d972f + 790d80cf4b6dc7fa405d9712e3e0ac8a3d3256d2 + + + + + varchar(n) + + + false + true + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_company_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_company_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_company_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_company_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_company_vc + + + + + 7c46717b372c8596c8138ff412b0363bea79262f + false + + + + + false + true + idx_sys_company_pcs + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_company_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + + + + + +
+ + b26a3a5334236c51bcb768aa530d16de4d1badda + 947 + 324 + Segoe UI + 9 + 3312 + 0 + + 128 + 128 + 192 + + + + 16b899ef08153060ff9b0f5d2d0d0b9aa08828a9 + 7ab826cc0649ad2e00abee7f8cf074e26259e32d + b26a3a5334236c51bcb768aa530d16de4d1badda + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + false + + RESTRICT + RESTRICT + 4f8af0766a0ba0866db74d9fe750581d1eefea91 + null + + + js_sys_dict_data + 字典数据表 + + + + + + + 32c7f5bb206f025610dd8211c6d397ee4845f3a3 + 424e7476db4a216fdf3eee470ce921c356f07e5e + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 9ca0e5536ea6174629b791183977dcc92c13f908 + 396fee69de4e5229fae2bbdd0501e98cb740bfe5 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cc294effb178877401baf60d266faff21b80c5ea + 99f4c815f19a4256e44625dac3423eaba8f23da1 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 + 4f8af0766a0ba0866db74d9fe750581d1eefea91 + 16b899ef08153060ff9b0f5d2d0d0b9aa08828a9 + + + + + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7feb27963741f108bd29ccf401a0f25ec6f588ff + 0baae707c361b3286955f0587b34476fd4f36cfd + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b3d67ac6d9320b61db546035ec7c8e487fd8a9c4 + 41906c8f63b3a63fb41393d75e45d10a247e492d + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1310f67a2772a72e48216c23deb7f7e7ef6f0041 + 645203ee29b1ee73a7f0d5e9878b4227a8b7302c + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1f24bfd07483cf3e59f6ecbd4966755d9670df74 + ac7e17e899d099929e517e74f7a116c939840895 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_dict_data_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_dict_data_dt + + + + + 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 + false + + + + + false + true + idx_sys_dict_data_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_dict_data_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_dict_data_pcs + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_dict_data_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_dict_data_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + false + true + idx_sys_dict_data_dv + + + + + 99f4c815f19a4256e44625dac3423eaba8f23da1 + false + + + + + + + + + +
+ + f8744238980256031ca440f8fac7ec78fa964411 + 128 + 352 + Segoe UI + 9 + 1658 + 936 + + 128 + 128 + 192 + + + + 0d5351be2978265e549a5f7c67e400471e55d00d + 7ef4520149693e59bda4b4f9a5d096b6e67a7097 + f8744238980256031ca440f8fac7ec78fa964411 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_role_data_scope + 角色数据权限表 + + + + + + + 7e2f59707205419c8556876dc854aeff0fbf7b57 + 22d38cfee95536d3e3af5fdd444b027a85d95432 + 0d5351be2978265e549a5f7c67e400471e55d00d + + + 控制角色编码 + + varchar(n) + + + false + true + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + df33cf2fa1349df70c9c48ac3a90b92a146224ed + 0584b59447729b3b369483353308793591c2c407 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 69bed3e42a9bbab83f7eb519e2786edc22260fd4 + 0f7661178a7a9832b2b97169c49191338e769f6e + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 286b8f3e3671588da8693a150d1c611ff0634dcf + db19c839b454a19a52e46cd7cbd9b0ba9dd8949c + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + +
+ + f9c5f9ef3226c5e4a275d1e0be09e8d6a4bbf098 + 443 + 379 + Segoe UI + 9 + 59 + 1944 + + 128 + 128 + 192 + + + + js_gen_table + 代码生成表 + + + + + + + f53f151fcfc0c5008da4d5314a50ef425a61c482 + a3c67705fc3d118ba46b7f57c9b24fbf0505d7b9 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ff1e0ad7d41ac61e908fc5656bdde67a164a6974 + c1fb8a292fb9eddf858dd20d28a548c6af66fe4e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 079f2c6d89277b4daecbd337e1bf4f781232976a + 971fd03164a8df8dde64dcbc49d25bd9e325b735 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03fa62677d146f929436f5b658fec1d454ec0adc + bc518c6e08246711da4ef4bbfd902690ebf6797d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7302decf65cd29ade7edd5a42ef629938c70f45c + b6fb605970d322ce2b1fa51d9b72cdedacd92f27 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3c113dc08971de6b9b524afdcb41a1562f130081 + 7d0c8a848b33bb097d6a6bfb1b223c0699830431 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 705ceee9c058659c1509ef35e6cdd1bedc4422c4 + d3257d8d8e063a7b8aab08c53d2ef9c5477e16d5 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ce338c590e6e91ae174e1728177e527d1fb5a1f8 + 2e588483efe68d91af1ede163ad51d1cfb60a8eb + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 58ee1b25a309334f43edd0e3695be10addd71571 + a8f71b15e475b44708cf2638e6d1484c4bf9c5c8 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dc13101e962883627abb3ca0967353d2d1920ae1 + 6d2b54ff28dde18b6b574adac48050be8679f071 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b50c10e77abcb30aa7a0efe2b3a9ef080516967a + 50929bce3dc6ed9c0d174fe99184428b6b25c376 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + edc273602f2feb54b0d9f060c9414873cf0e46d1 + 34b9c5b33bfbc15bd8c8fbabe2e9e7f970cc9ddd + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a7e9e473423331cc2e697d7bad777fab8ea6487a + 69eabc90e25d0e1334e2e95c03192aea25a124ec + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 688b0f7ac0036d32e75f7da7a74d307c976be2ab + e8f6148deaa56e9cde72c0ee2f693ba95ca4dcf7 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_gen_table_ptn + + + + + + + + + + + +
+ + f6f3255545f52e35027e72c2dc95db1a2b9bb3dd + 254 + 288 + Segoe UI + 9 + 2208 + 1932 + + 128 + 128 + 192 + + + + js_sys_config + 参数配置表 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + f6060612c049709042d4157e4e40e81bd0321afe + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ee84723c8bde13d17589d3a0059e969a54af1a76 + e0f7d2c8f9db92fbc2ae5ac0fb1d0de34b8789f2 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 3bd475d905295b18837332926f66deacf286f563 + 807d1ffdb87bb0bd9cc5211997e18efc06db6624 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a49b2ebdb0ca593f13c432eb28d1bbfe109c1421 + c97cf10bf385b6b91e85108039b1a55d55fbde2e + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7feb27963741f108bd29ccf401a0f25ec6f588ff + 55bd63033160c21ac6e79051e3ea58f1bde0cac7 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_config_key + + + + + 807d1ffdb87bb0bd9cc5211997e18efc06db6624 + false + + + + + + + + + +
+ + 3f27d1586b2cd7849b9ae30883c1191ade8f874c + 317 + 356 + Segoe UI + 9 + 948 + 1950 + + 128 + 128 + 192 + + + + js_sys_job + 作业调度表 + + + + + + + 70abca97f16eab0d562a2104ec1a0ede326b1c46 + 55c7d0a9ab8650c264a75bb1bf958cac2fe68152 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fe17467ad48944f125de4abf28e973234a9bcb4 + 443772d4627c23aef484c324c8e431121b921a44 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6cf6b1b94ad089cda04f9ed8ea2ad13bd9de0dd0 + 225e6d868b8d45320dc7f79db6296db64985b308 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2663716e6af40682333d3e8495a04bceff16647 + c5abf897611d8a927582d1dcb3deceef5c164614 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 03debcf1d4bf27cdad9acd24fda84a6ee9cdd908 + d8ece7f15423d813de0dc100fa1c67e047ca4a08 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 44ce4edd5ad45896934d6f90f14af5884b98ba5b + 7041a843a37e89ce935ad9309fa1a3b2548920e5 + + + + + decimal(p) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261aca14bc2dd0bef97fa78a1256a95b5cb94171 + 91c2e73c20940e4a715ffb02148e2f3a1bb72334 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 481c1a6225e0f2a86dbf4f752e9455afac57f897 + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_job_status + + + + + 644c88074f6f9cbe4b29b12b9633f4e238a2761b + false + + + + + + + + + +
+ + 519d64ec10e7c0df51e0b14489d6666c04b93e34 + 443 + 484 + Segoe UI + 9 + 2682 + 1950 + + 128 + 128 + 192 + + + + js_sys_msg_inner + 内部消息 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 5eecd1e4e1dc132da52de1bd1f59b13dd13a3587 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + a304841afc9968e7c8768979fe2ba3f2f315db78 + cbbb279fbb0f0ea5d67536332ce7d9a8b3d70e36 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a654ac8de54e8c19cfdba4bcf6d636ab760799b9 + 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 31410c3d884588423ca2a5803e78d0934412f458 + 10a8ef0d67bd3c9a90e9c67dc86953fefb8f8755 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 98eb079aebd2f56c461cb92d97ab4d56f603b840 + 48bf7c9cb90d62b9cba0283d51bf94980e9fea92 + + + + + clob + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a70dd4133cc6302307f8a0ac828a6049c401db58 + 5b256d59f963bf2a76cf35c847634b1188154874 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5797ae3ca5da40a8a45dfd0071f3589585c2517f + fe9b7e3236d284db50cb1d4cda9a77d1d8de40d2 + + + + + clob + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 86b915810d6436eb5c60062abbe4f8910c86f89c + b21a2db1cf685edc44c2bf252785aabc4cfb0794 + + + + + clob + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c5364fcf3327275d038d229e22f80ce97c28d402 + b0959f0c2f737aa49188e57cc71afb3242e9e97b + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 949f48cec7229094875af06d5c3ee4e7efbba1e0 + 8d09d0b4b174964fb858b7ccb77ed9e14767de65 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5e197b7f106763a6952e72203fcc902cea793853 + d492c41633035ed8c33c89c5c704ef2dd5d7d32c + + + + + datetime + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + da74a37a1025119cd79a05644781c76b606352d3 + 0390e069a393fa7b2f2de0531b12470c299317f8 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 81e89a36c985a9f69710177677cd7be6ed6ea089 + fd262e1d867fb854931a86728233eec74fc0099b + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 20092a8f08bbf1304383014693172e4fc863277d + 6d885df5f4956aeb6b228e769b8d037459d7a7d7 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + + + + false + true + idx_sys_msg_inner_cb + + + + + e5355faba5ec3c9128507dd4c48ea9230631cf83 + false + + + + + false + true + idx_sys_msg_inner_status + + + + + 6d885df5f4956aeb6b228e769b8d037459d7a7d7 + false + + + + + false + true + idx_sys_msg_inner_cl + + + + + 04c3905ff7bf6c16dbe32569f226a3cbaf2674fe + false + + + + + false + true + idx_sys_msg_inner_sc + + + + + b0959f0c2f737aa49188e57cc71afb3242e9e97b + false + + + + + false + true + idx_sys_msg_inner_sd + + + + + d492c41633035ed8c33c89c5c704ef2dd5d7d32c + false + + + + + + + + + +
+ + f9d2dda2ab366d90319413b49edec0988353a99a + 296 + 320 + Segoe UI + 9 + 1776 + 1932 + + 128 + 128 + 192 + + + + js_sys_module + 模块表 + + + + + + + 446f3cd3b9b1dd50fa5989a256c401a193a3706c + d964f7c50e480b77047f79d1107c95d0bbe9717c + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2f27eb5025ffc1dddc8dd8f526bc9ba3fddd976b + 4c086c0ba92da3a70e70b9771d6af64841cc5080 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f7114401c278a134ec74f1836c0f4afeed91cf0f + 9d82192f942304d0060c53ac9a03769df6797ff0 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a349e3aeee90969e1e0c7f6ad8481b209eb691f3 + 35d6215c6b80d8640b1632e1b8b2139f10d0cec1 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f1196b5a1e9072ac4cc990c913b774e777b09a46 + 33577148015618b442b625836cf90ba27ace9621 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cc6e1b3ebd5a36ac1f844bc246537c6f1e99c3af + 6281abb4d5813839a39d7d75ce39843c4467c390 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + + + + false + true + idx_sys_module_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + + + + + +
diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 015bdd57..efe76989 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column]; +IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table]; IF OBJECT_ID('[js_sys_company_office]') IS NOT NULL DROP TABLE [js_sys_company_office]; IF OBJECT_ID('[js_sys_employee_post]') IS NOT NULL DROP TABLE [js_sys_employee_post]; IF OBJECT_ID('[js_sys_user_data_scope]') IS NOT NULL DROP TABLE [js_sys_user_data_scope]; @@ -36,6 +38,58 @@ IF OBJECT_ID('[js_sys_role]') IS NOT NULL DROP TABLE [js_sys_role]; /* Create Tables */ +-- 代码生成表 +CREATE TABLE [js_gen_table] +( + [table_name] varchar(64) NOT NULL, + [class_name] varchar(100) NOT NULL, + [comments] nvarchar(500) NOT NULL, + [parent_table_name] varchar(64), + [parent_table_fk_name] varchar(64), + [tpl_category] varchar(200), + [package_name] varchar(500), + [module_name] varchar(30), + [sub_module_name] varchar(30), + [function_name] nvarchar(200), + [function_name_simple] nvarchar(50), + [function_author] nvarchar(50), + [gen_base_dir] nvarchar(1000), + [options] nvarchar(1000), + [create_by] varchar(64) NOT NULL, + [create_date] datetime NOT NULL, + [update_by] varchar(64) NOT NULL, + [update_date] datetime NOT NULL, + [remarks] nvarchar(500), + PRIMARY KEY ([table_name]) +); + + +-- 代码生成表列 +CREATE TABLE [js_gen_table_column] +( + [id] varchar(64) NOT NULL, + [table_name] varchar(64) NOT NULL, + [column_name] varchar(64) NOT NULL, + [column_sort] decimal(10), + [column_type] varchar(100) NOT NULL, + [column_label] nvarchar(50), + [comments] nvarchar(500) NOT NULL, + [attr_name] varchar(200) NOT NULL, + [attr_type] varchar(200) NOT NULL, + [is_pk] char(1), + [is_null] char(1), + [is_insert] char(1), + [is_update] char(1), + [is_list] char(1), + [is_query] char(1), + [query_type] varchar(200), + [is_edit] char(1), + [show_type] varchar(200), + [options] nvarchar(1000), + PRIMARY KEY ([id]) +); + + -- 行政区划 CREATE TABLE [js_sys_area] ( @@ -734,6 +788,8 @@ CREATE TABLE [js_sys_user_role] /* Create Indexes */ +CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] (); +CREATE INDEX [idx_gen_table_column_tn] ON [js_gen_table_column] (); CREATE INDEX [idx_sys_area_pc] ON [js_sys_area] ([parent_code]); CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]); CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 618b9cbc..bfbd13cc 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -2,6 +2,8 @@ SET SESSION FOREIGN_KEY_CHECKS=0; /* Drop Tables */ +DROP TABLE IF EXISTS js_gen_table_column; +DROP TABLE IF EXISTS js_gen_table; DROP TABLE IF EXISTS js_sys_company_office; DROP TABLE IF EXISTS js_sys_employee_post; DROP TABLE IF EXISTS js_sys_user_data_scope; @@ -37,6 +39,58 @@ DROP TABLE IF EXISTS js_sys_role; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar(64) NOT NULL COMMENT '表名', + class_name varchar(100) NOT NULL COMMENT '实体类名称', + comments varchar(500) NOT NULL COMMENT '表说明', + parent_table_name varchar(64) COMMENT '关联父表的表名', + parent_table_fk_name varchar(64) COMMENT '本表关联父表的外键名', + tpl_category varchar(200) COMMENT '使用的模板', + package_name varchar(500) COMMENT '生成包路径', + module_name varchar(30) COMMENT '生成模块名', + sub_module_name varchar(30) COMMENT '生成子模块名', + function_name varchar(200) COMMENT '生成功能名', + function_name_simple varchar(50) COMMENT '生成功能名（简写）', + function_author varchar(50) COMMENT '生成功能作者', + gen_base_dir varchar(1000) COMMENT '生成基础路径', + options varchar(1000) COMMENT '其它生成选项', + create_by varchar(64) NOT NULL COMMENT '创建者', + create_date datetime NOT NULL COMMENT '创建时间', + update_by varchar(64) NOT NULL COMMENT '更新者', + update_date datetime NOT NULL COMMENT '更新时间', + remarks varchar(500) COMMENT '备注信息', + PRIMARY KEY (table_name) +) COMMENT = '代码生成表'; + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar(64) NOT NULL COMMENT '编号', + table_name varchar(64) NOT NULL COMMENT '表名', + column_name varchar(64) NOT NULL COMMENT '列名', + column_sort decimal(10) COMMENT '列排序（升序）', + column_type varchar(100) NOT NULL COMMENT '类型', + column_label varchar(50) COMMENT '列标签名', + comments varchar(500) NOT NULL COMMENT '列备注说明', + attr_name varchar(200) NOT NULL COMMENT '类的属性名', + attr_type varchar(200) NOT NULL COMMENT '类的属性类型', + is_pk char(1) COMMENT '是否主键', + is_null char(1) COMMENT '是否可为空', + is_insert char(1) COMMENT '是否插入字段', + is_update char(1) COMMENT '是否更新字段', + is_list char(1) COMMENT '是否列表字段', + is_query char(1) COMMENT '是否查询字段', + query_type varchar(200) COMMENT '查询方式', + is_edit char(1) COMMENT '是否编辑字段', + show_type varchar(200) COMMENT '表单类型', + options varchar(1000) COMMENT '其它生成选项', + PRIMARY KEY (id) +) COMMENT = '代码生成表列'; + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -737,6 +791,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code ASC); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort ASC); CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC); diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 75a88200..203880d5 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +DROP TABLE js_gen_table_column CASCADE CONSTRAINTS; +DROP TABLE js_gen_table CASCADE CONSTRAINTS; DROP TABLE js_sys_company_office CASCADE CONSTRAINTS; DROP TABLE js_sys_employee_post CASCADE CONSTRAINTS; DROP TABLE js_sys_user_data_scope CASCADE CONSTRAINTS; @@ -36,6 +38,58 @@ DROP TABLE js_sys_role CASCADE CONSTRAINTS; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar2(64) NOT NULL, + class_name varchar2(100) NOT NULL, + comments nvarchar2(500) NOT NULL, + parent_table_name varchar2(64), + parent_table_fk_name varchar2(64), + tpl_category varchar2(200), + package_name varchar2(500), + module_name varchar2(30), + sub_module_name varchar2(30), + function_name nvarchar2(200), + function_name_simple nvarchar2(50), + function_author nvarchar2(50), + gen_base_dir nvarchar2(1000), + options nvarchar2(1000), + create_by varchar2(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar2(64) NOT NULL, + update_date timestamp NOT NULL, + remarks nvarchar2(500), + PRIMARY KEY (table_name) +); + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar2(64) NOT NULL, + table_name varchar2(64) NOT NULL, + column_name varchar2(64) NOT NULL, + column_sort number(10), + column_type varchar2(100) NOT NULL, + column_label nvarchar2(50), + comments nvarchar2(500) NOT NULL, + attr_name varchar2(200) NOT NULL, + attr_type varchar2(200) NOT NULL, + is_pk char(1), + is_null char(1), + is_insert char(1), + is_update char(1), + is_list char(1), + is_query char(1), + query_type varchar2(200), + is_edit char(1), + show_type varchar2(200), + options nvarchar2(1000), + PRIMARY KEY (id) +); + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -734,6 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); @@ -861,6 +917,46 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code); /* Comments */ +COMMENT ON TABLE js_gen_table IS '代码生成表'; +COMMENT ON COLUMN js_gen_table.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; +COMMENT ON COLUMN js_gen_table.comments IS '表说明'; +COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; +COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; +COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; +COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; +COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; +COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; +COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; +COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; +COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; +COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; +COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; +COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; +COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; +COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; +COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; +COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; +COMMENT ON COLUMN js_gen_table_column.id IS '编号'; +COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; +COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; +COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; +COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; +COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; +COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; +COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; +COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; +COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; +COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; +COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; +COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; +COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; +COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; +COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; +COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; +COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; COMMENT ON TABLE js_sys_area IS '行政区划'; COMMENT ON COLUMN js_sys_area.area_code IS '区域编码'; COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 95d63188..8bb731a2 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +DROP TABLE IF EXISTS js_gen_table_column; +DROP TABLE IF EXISTS js_gen_table; DROP TABLE IF EXISTS js_sys_company_office; DROP TABLE IF EXISTS js_sys_employee_post; DROP TABLE IF EXISTS js_sys_user_data_scope; @@ -36,6 +38,58 @@ DROP TABLE IF EXISTS js_sys_role; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar(64) NOT NULL, + class_name varchar(100) NOT NULL, + comments varchar(500) NOT NULL, + parent_table_name varchar(64), + parent_table_fk_name varchar(64), + tpl_category varchar(200), + package_name varchar(500), + module_name varchar(30), + sub_module_name varchar(30), + function_name varchar(200), + function_name_simple varchar(50), + function_author varchar(50), + gen_base_dir varchar(1000), + options varchar(1000), + create_by varchar(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar(64) NOT NULL, + update_date timestamp NOT NULL, + remarks varchar(500), + PRIMARY KEY (table_name) +) WITHOUT OIDS; + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar(64) NOT NULL, + table_name varchar(64) NOT NULL, + column_name varchar(64) NOT NULL, + column_sort decimal(10), + column_type varchar(100) NOT NULL, + column_label varchar(50), + comments varchar(500) NOT NULL, + attr_name varchar(200) NOT NULL, + attr_type varchar(200) NOT NULL, + is_pk char(1), + is_null char(1), + is_insert char(1), + is_update char(1), + is_list char(1), + is_query char(1), + query_type varchar(200), + is_edit char(1), + show_type varchar(200), + options varchar(1000), + PRIMARY KEY (id) +) WITHOUT OIDS; + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -734,6 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); @@ -861,6 +917,46 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code); /* Comments */ +COMMENT ON TABLE js_gen_table IS '代码生成表'; +COMMENT ON COLUMN js_gen_table.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; +COMMENT ON COLUMN js_gen_table.comments IS '表说明'; +COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; +COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; +COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; +COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; +COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; +COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; +COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; +COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; +COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; +COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; +COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; +COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; +COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; +COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; +COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; +COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; +COMMENT ON COLUMN js_gen_table_column.id IS '编号'; +COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; +COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; +COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; +COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; +COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; +COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; +COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; +COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; +COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; +COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; +COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; +COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; +COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; +COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; +COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; +COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; +COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; COMMENT ON TABLE js_sys_area IS '行政区划'; COMMENT ON COLUMN js_sys_area.area_code IS '区域编码'; COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号'; diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5c44b714..dc5fa7a1 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -35,13 +35,6 @@ ${project.parent.version} - - - com.jeesite - jeesite-module-devtools - ${project.parent.version} - - 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 3db5dc48..50ee168a 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 @@ -6,8 +6,13 @@ package com.jeesite.modules.sys.db; import org.springframework.beans.factory.annotation.Autowired; 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.sys.dao.RoleMenuDao; import com.jeesite.modules.sys.entity.Area; import com.jeesite.modules.sys.entity.Company; @@ -61,6 +66,7 @@ public class InitCoreData extends BaseInitDataTests { public void createTable() throws Exception{ runScript("core.sql"); runScript("job.sql"); + runScript("test.sql"); } /** @@ -360,4 +366,135 @@ public class InitCoreData extends BaseInitDataTests { } }); } + + @Autowired + private GenTableService genTableService; + /** + * 代码生成测试数据 + */ + public 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"); + } + } + } + + /** + * 代码生成树表测试数据 + */ + public 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); + } } diff --git a/modules/core/src/main/resources/views/modules/sys/logForm.html b/modules/core/src/main/resources/views/modules/sys/logForm.html index 4e9b228b..165b4793 100644 --- a/modules/core/src/main/resources/views/modules/sys/logForm.html +++ b/modules/core/src/main/resources/views/modules/sys/logForm.html @@ -53,7 +53,7 @@
- <#form:input path="requestParams" class="form-control "/> + <#form:textarea path="requestParams" rows="1" class="form-control "/>
diff --git a/web/.settings/org.eclipse.wst.common.component b/web/.settings/org.eclipse.wst.common.component index 71f6eccc..e1f0d391 100644 --- a/web/.settings/org.eclipse.wst.common.component +++ b/web/.settings/org.eclipse.wst.common.component @@ -9,9 +9,6 @@ uses - - uses - diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat index 56bd733a..cad88667 100644 --- a/web/bin/init-data.bat +++ b/web/bin/init-data.bat @@ -36,6 +36,6 @@ echo. cd %~dp0 cd .. -call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData +call mvn test -Dtest=com.jeesite.test.InitCoreData pause \ No newline at end of file diff --git a/web/bin/init-data.sh b/web/bin/init-data.sh index c4899db1..93268f61 100644 --- a/web/bin/init-data.sh +++ b/web/bin/init-data.sh @@ -29,4 +29,4 @@ read -s -n1 -p "请按任意键继续 ... " echo "" cd .. -mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData +mvn test -Dtest=com.jeesite.test.InitCoreData diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 015bdd57..efe76989 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column]; +IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table]; IF OBJECT_ID('[js_sys_company_office]') IS NOT NULL DROP TABLE [js_sys_company_office]; IF OBJECT_ID('[js_sys_employee_post]') IS NOT NULL DROP TABLE [js_sys_employee_post]; IF OBJECT_ID('[js_sys_user_data_scope]') IS NOT NULL DROP TABLE [js_sys_user_data_scope]; @@ -36,6 +38,58 @@ IF OBJECT_ID('[js_sys_role]') IS NOT NULL DROP TABLE [js_sys_role]; /* Create Tables */ +-- 代码生成表 +CREATE TABLE [js_gen_table] +( + [table_name] varchar(64) NOT NULL, + [class_name] varchar(100) NOT NULL, + [comments] nvarchar(500) NOT NULL, + [parent_table_name] varchar(64), + [parent_table_fk_name] varchar(64), + [tpl_category] varchar(200), + [package_name] varchar(500), + [module_name] varchar(30), + [sub_module_name] varchar(30), + [function_name] nvarchar(200), + [function_name_simple] nvarchar(50), + [function_author] nvarchar(50), + [gen_base_dir] nvarchar(1000), + [options] nvarchar(1000), + [create_by] varchar(64) NOT NULL, + [create_date] datetime NOT NULL, + [update_by] varchar(64) NOT NULL, + [update_date] datetime NOT NULL, + [remarks] nvarchar(500), + PRIMARY KEY ([table_name]) +); + + +-- 代码生成表列 +CREATE TABLE [js_gen_table_column] +( + [id] varchar(64) NOT NULL, + [table_name] varchar(64) NOT NULL, + [column_name] varchar(64) NOT NULL, + [column_sort] decimal(10), + [column_type] varchar(100) NOT NULL, + [column_label] nvarchar(50), + [comments] nvarchar(500) NOT NULL, + [attr_name] varchar(200) NOT NULL, + [attr_type] varchar(200) NOT NULL, + [is_pk] char(1), + [is_null] char(1), + [is_insert] char(1), + [is_update] char(1), + [is_list] char(1), + [is_query] char(1), + [query_type] varchar(200), + [is_edit] char(1), + [show_type] varchar(200), + [options] nvarchar(1000), + PRIMARY KEY ([id]) +); + + -- 行政区划 CREATE TABLE [js_sys_area] ( @@ -734,6 +788,8 @@ CREATE TABLE [js_sys_user_role] /* Create Indexes */ +CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] (); +CREATE INDEX [idx_gen_table_column_tn] ON [js_gen_table_column] (); CREATE INDEX [idx_sys_area_pc] ON [js_sys_area] ([parent_code]); CREATE INDEX [idx_sys_area_ts] ON [js_sys_area] ([tree_sort]); CREATE INDEX [idx_sys_area_status] ON [js_sys_area] ([status]); diff --git a/web/db/mssql/gen.sql b/web/db/mssql/gen.sql deleted file mode 100644 index 22342646..00000000 --- a/web/db/mssql/gen.sql +++ /dev/null @@ -1,71 +0,0 @@ - -/* Drop Tables */ - -IF OBJECT_ID('[js_gen_table_column]') IS NOT NULL DROP TABLE [js_gen_table_column]; -IF OBJECT_ID('[js_gen_table]') IS NOT NULL DROP TABLE [js_gen_table]; - - - - -/* Create Tables */ - --- 代码生成表 -CREATE TABLE [js_gen_table] -( - [table_name] varchar(64) NOT NULL, - [class_name] varchar(100) NOT NULL, - [comments] nvarchar(500) NOT NULL, - [parent_table_name] varchar(64), - [parent_table_fk_name] varchar(64), - [tpl_category] varchar(200), - [package_name] varchar(500), - [module_name] varchar(30), - [sub_module_name] varchar(30), - [function_name] nvarchar(200), - [function_name_simple] nvarchar(50), - [function_author] nvarchar(50), - [gen_base_dir] nvarchar(1000), - [options] nvarchar(1000), - [create_by] varchar(64) NOT NULL, - [create_date] datetime NOT NULL, - [update_by] varchar(64) NOT NULL, - [update_date] datetime NOT NULL, - [remarks] nvarchar(500), - PRIMARY KEY ([table_name]) -); - - --- 代码生成表列 -CREATE TABLE [js_gen_table_column] -( - [id] varchar(64) NOT NULL, - [table_name] varchar(64) NOT NULL, - [column_name] varchar(64) NOT NULL, - [column_sort] decimal(10), - [column_type] varchar(100) NOT NULL, - [column_label] nvarchar(50), - [comments] nvarchar(500) NOT NULL, - [attr_name] varchar(200) NOT NULL, - [attr_type] varchar(200) NOT NULL, - [is_pk] char(1), - [is_null] char(1), - [is_insert] char(1), - [is_update] char(1), - [is_list] char(1), - [is_query] char(1), - [query_type] varchar(200), - [is_edit] char(1), - [show_type] varchar(200), - [options] nvarchar(1000), - PRIMARY KEY ([id]) -); - - - -/* Create Indexes */ - -CREATE INDEX [idx_gen_table_ptn] ON [js_gen_table] ([parent_table_name]); -CREATE INDEX [idx_gen_table_column_tn] ON [js_gen_table_column] ([table_name]); - - - diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 618b9cbc..bfbd13cc 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -2,6 +2,8 @@ SET SESSION FOREIGN_KEY_CHECKS=0; /* Drop Tables */ +DROP TABLE IF EXISTS js_gen_table_column; +DROP TABLE IF EXISTS js_gen_table; DROP TABLE IF EXISTS js_sys_company_office; DROP TABLE IF EXISTS js_sys_employee_post; DROP TABLE IF EXISTS js_sys_user_data_scope; @@ -37,6 +39,58 @@ DROP TABLE IF EXISTS js_sys_role; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar(64) NOT NULL COMMENT '表名', + class_name varchar(100) NOT NULL COMMENT '实体类名称', + comments varchar(500) NOT NULL COMMENT '表说明', + parent_table_name varchar(64) COMMENT '关联父表的表名', + parent_table_fk_name varchar(64) COMMENT '本表关联父表的外键名', + tpl_category varchar(200) COMMENT '使用的模板', + package_name varchar(500) COMMENT '生成包路径', + module_name varchar(30) COMMENT '生成模块名', + sub_module_name varchar(30) COMMENT '生成子模块名', + function_name varchar(200) COMMENT '生成功能名', + function_name_simple varchar(50) COMMENT '生成功能名（简写）', + function_author varchar(50) COMMENT '生成功能作者', + gen_base_dir varchar(1000) COMMENT '生成基础路径', + options varchar(1000) COMMENT '其它生成选项', + create_by varchar(64) NOT NULL COMMENT '创建者', + create_date datetime NOT NULL COMMENT '创建时间', + update_by varchar(64) NOT NULL COMMENT '更新者', + update_date datetime NOT NULL COMMENT '更新时间', + remarks varchar(500) COMMENT '备注信息', + PRIMARY KEY (table_name) +) COMMENT = '代码生成表'; + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar(64) NOT NULL COMMENT '编号', + table_name varchar(64) NOT NULL COMMENT '表名', + column_name varchar(64) NOT NULL COMMENT '列名', + column_sort decimal(10) COMMENT '列排序（升序）', + column_type varchar(100) NOT NULL COMMENT '类型', + column_label varchar(50) COMMENT '列标签名', + comments varchar(500) NOT NULL COMMENT '列备注说明', + attr_name varchar(200) NOT NULL COMMENT '类的属性名', + attr_type varchar(200) NOT NULL COMMENT '类的属性类型', + is_pk char(1) COMMENT '是否主键', + is_null char(1) COMMENT '是否可为空', + is_insert char(1) COMMENT '是否插入字段', + is_update char(1) COMMENT '是否更新字段', + is_list char(1) COMMENT '是否列表字段', + is_query char(1) COMMENT '是否查询字段', + query_type varchar(200) COMMENT '查询方式', + is_edit char(1) COMMENT '是否编辑字段', + show_type varchar(200) COMMENT '表单类型', + options varchar(1000) COMMENT '其它生成选项', + PRIMARY KEY (id) +) COMMENT = '代码生成表列'; + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -737,6 +791,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code ASC); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort ASC); CREATE INDEX idx_sys_area_status ON js_sys_area (status ASC); diff --git a/web/db/mysql/gen.sql b/web/db/mysql/gen.sql deleted file mode 100644 index 9ecaa158..00000000 --- a/web/db/mysql/gen.sql +++ /dev/null @@ -1,72 +0,0 @@ -SET SESSION FOREIGN_KEY_CHECKS=0; - -/* Drop Tables */ - -DROP TABLE IF EXISTS js_gen_table_column; -DROP TABLE IF EXISTS js_gen_table; - - - - -/* Create Tables */ - --- 代码生成表 -CREATE TABLE js_gen_table -( - table_name varchar(64) NOT NULL COMMENT '表名', - class_name varchar(100) NOT NULL COMMENT '实体类名称', - comments varchar(500) NOT NULL COMMENT '表说明', - parent_table_name varchar(64) COMMENT '关联父表的表名', - parent_table_fk_name varchar(64) COMMENT '本表关联父表的外键名', - tpl_category varchar(200) COMMENT '使用的模板', - package_name varchar(500) COMMENT '生成包路径', - module_name varchar(30) COMMENT '生成模块名', - sub_module_name varchar(30) COMMENT '生成子模块名', - function_name varchar(200) COMMENT '生成功能名', - function_name_simple varchar(50) COMMENT '生成功能名（简写）', - function_author varchar(50) COMMENT '生成功能作者', - gen_base_dir varchar(1000) COMMENT '生成基础路径', - options varchar(1000) COMMENT '其它生成选项', - create_by varchar(64) NOT NULL COMMENT '创建者', - create_date datetime NOT NULL COMMENT '创建时间', - update_by varchar(64) NOT NULL COMMENT '更新者', - update_date datetime NOT NULL COMMENT '更新时间', - remarks varchar(500) COMMENT '备注信息', - PRIMARY KEY (table_name) -) COMMENT = '代码生成表'; - - --- 代码生成表列 -CREATE TABLE js_gen_table_column -( - id varchar(64) NOT NULL COMMENT '编号', - table_name varchar(64) NOT NULL COMMENT '表名', - column_name varchar(64) NOT NULL COMMENT '列名', - column_sort decimal(10) COMMENT '列排序（升序）', - column_type varchar(100) NOT NULL COMMENT '类型', - column_label varchar(50) COMMENT '列标签名', - comments varchar(500) NOT NULL COMMENT '列备注说明', - attr_name varchar(200) NOT NULL COMMENT '类的属性名', - attr_type varchar(200) NOT NULL COMMENT '类的属性类型', - is_pk char(1) COMMENT '是否主键', - is_null char(1) COMMENT '是否可为空', - is_insert char(1) COMMENT '是否插入字段', - is_update char(1) COMMENT '是否更新字段', - is_list char(1) COMMENT '是否列表字段', - is_query char(1) COMMENT '是否查询字段', - query_type varchar(200) COMMENT '查询方式', - is_edit char(1) COMMENT '是否编辑字段', - show_type varchar(200) COMMENT '表单类型', - options varchar(1000) COMMENT '其它生成选项', - PRIMARY KEY (id) -) COMMENT = '代码生成表列'; - - - -/* Create Indexes */ - -CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name ASC); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name ASC); - - - diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 75a88200..203880d5 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +DROP TABLE js_gen_table_column CASCADE CONSTRAINTS; +DROP TABLE js_gen_table CASCADE CONSTRAINTS; DROP TABLE js_sys_company_office CASCADE CONSTRAINTS; DROP TABLE js_sys_employee_post CASCADE CONSTRAINTS; DROP TABLE js_sys_user_data_scope CASCADE CONSTRAINTS; @@ -36,6 +38,58 @@ DROP TABLE js_sys_role CASCADE CONSTRAINTS; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar2(64) NOT NULL, + class_name varchar2(100) NOT NULL, + comments nvarchar2(500) NOT NULL, + parent_table_name varchar2(64), + parent_table_fk_name varchar2(64), + tpl_category varchar2(200), + package_name varchar2(500), + module_name varchar2(30), + sub_module_name varchar2(30), + function_name nvarchar2(200), + function_name_simple nvarchar2(50), + function_author nvarchar2(50), + gen_base_dir nvarchar2(1000), + options nvarchar2(1000), + create_by varchar2(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar2(64) NOT NULL, + update_date timestamp NOT NULL, + remarks nvarchar2(500), + PRIMARY KEY (table_name) +); + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar2(64) NOT NULL, + table_name varchar2(64) NOT NULL, + column_name varchar2(64) NOT NULL, + column_sort number(10), + column_type varchar2(100) NOT NULL, + column_label nvarchar2(50), + comments nvarchar2(500) NOT NULL, + attr_name varchar2(200) NOT NULL, + attr_type varchar2(200) NOT NULL, + is_pk char(1), + is_null char(1), + is_insert char(1), + is_update char(1), + is_list char(1), + is_query char(1), + query_type varchar2(200), + is_edit char(1), + show_type varchar2(200), + options nvarchar2(1000), + PRIMARY KEY (id) +); + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -734,6 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); @@ -861,6 +917,46 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code); /* Comments */ +COMMENT ON TABLE js_gen_table IS '代码生成表'; +COMMENT ON COLUMN js_gen_table.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; +COMMENT ON COLUMN js_gen_table.comments IS '表说明'; +COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; +COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; +COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; +COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; +COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; +COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; +COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; +COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; +COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; +COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; +COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; +COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; +COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; +COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; +COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; +COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; +COMMENT ON COLUMN js_gen_table_column.id IS '编号'; +COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; +COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; +COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; +COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; +COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; +COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; +COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; +COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; +COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; +COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; +COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; +COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; +COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; +COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; +COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; +COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; +COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; COMMENT ON TABLE js_sys_area IS '行政区划'; COMMENT ON COLUMN js_sys_area.area_code IS '区域编码'; COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号'; diff --git a/web/db/oracle/create_user.sql b/web/db/oracle/create_user.sql index c21a1239..a270e674 100644 --- a/web/db/oracle/create_user.sql +++ b/web/db/oracle/create_user.sql @@ -6,4 +6,10 @@ create user jeesite grant connect,resource,create session,select any table, create any view,create any table,create any index, drop any table,drop any view,drop any index - to jeesite; \ No newline at end of file + to jeesite; + +-- 多数据源分布式事务下，需要对目标用户进行如下授权，否则会提示错误：ResourceException: Error in recovery +grant select on sys.dba_pending_transactions to jeesite; +grant select on sys.pending_trans$ to jeesite; +grant select on sys.dba_2pc_pending to jeesite; +grant execute on sys.dbms_system to jeesite; diff --git a/web/db/oracle/gen.sql b/web/db/oracle/gen.sql deleted file mode 100644 index 7d4ca585..00000000 --- a/web/db/oracle/gen.sql +++ /dev/null @@ -1,116 +0,0 @@ - -/* Drop Tables */ - -DROP TABLE js_gen_table_column CASCADE CONSTRAINTS; -DROP TABLE js_gen_table CASCADE CONSTRAINTS; - - - - -/* Create Tables */ - --- 代码生成表 -CREATE TABLE js_gen_table -( - table_name varchar2(64) NOT NULL, - class_name varchar2(100) NOT NULL, - comments nvarchar2(500) NOT NULL, - parent_table_name varchar2(64), - parent_table_fk_name varchar2(64), - tpl_category varchar2(200), - package_name varchar2(500), - module_name varchar2(30), - sub_module_name varchar2(30), - function_name nvarchar2(200), - function_name_simple nvarchar2(50), - function_author nvarchar2(50), - gen_base_dir nvarchar2(1000), - options nvarchar2(1000), - create_by varchar2(64) NOT NULL, - create_date timestamp NOT NULL, - update_by varchar2(64) NOT NULL, - update_date timestamp NOT NULL, - remarks nvarchar2(500), - PRIMARY KEY (table_name) -); - - --- 代码生成表列 -CREATE TABLE js_gen_table_column -( - id varchar2(64) NOT NULL, - table_name varchar2(64) NOT NULL, - column_name varchar2(64) NOT NULL, - column_sort number(10), - column_type varchar2(100) NOT NULL, - column_label nvarchar2(50), - comments nvarchar2(500) NOT NULL, - attr_name varchar2(200) NOT NULL, - attr_type varchar2(200) NOT NULL, - is_pk char(1), - is_null char(1), - is_insert char(1), - is_update char(1), - is_list char(1), - is_query char(1), - query_type varchar2(200), - is_edit char(1), - show_type varchar2(200), - options nvarchar2(1000), - PRIMARY KEY (id) -); - - - -/* Create Indexes */ - -CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name); - - - -/* Comments */ - -COMMENT ON TABLE js_gen_table IS '代码生成表'; -COMMENT ON COLUMN js_gen_table.table_name IS '表名'; -COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; -COMMENT ON COLUMN js_gen_table.comments IS '表说明'; -COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; -COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; -COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; -COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; -COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; -COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; -COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; -COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; -COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; -COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; -COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; -COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; -COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; -COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; -COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; -COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; -COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; -COMMENT ON COLUMN js_gen_table_column.id IS '编号'; -COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; -COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; -COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; -COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; -COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; -COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; -COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; -COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; -COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; -COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; -COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; -COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; -COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; -COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; -COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; -COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; -COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; -COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; - - - diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 95d63188..8bb731a2 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -1,6 +1,8 @@ /* Drop Tables */ +DROP TABLE IF EXISTS js_gen_table_column; +DROP TABLE IF EXISTS js_gen_table; DROP TABLE IF EXISTS js_sys_company_office; DROP TABLE IF EXISTS js_sys_employee_post; DROP TABLE IF EXISTS js_sys_user_data_scope; @@ -36,6 +38,58 @@ DROP TABLE IF EXISTS js_sys_role; /* Create Tables */ +-- 代码生成表 +CREATE TABLE js_gen_table +( + table_name varchar(64) NOT NULL, + class_name varchar(100) NOT NULL, + comments varchar(500) NOT NULL, + parent_table_name varchar(64), + parent_table_fk_name varchar(64), + tpl_category varchar(200), + package_name varchar(500), + module_name varchar(30), + sub_module_name varchar(30), + function_name varchar(200), + function_name_simple varchar(50), + function_author varchar(50), + gen_base_dir varchar(1000), + options varchar(1000), + create_by varchar(64) NOT NULL, + create_date timestamp NOT NULL, + update_by varchar(64) NOT NULL, + update_date timestamp NOT NULL, + remarks varchar(500), + PRIMARY KEY (table_name) +) WITHOUT OIDS; + + +-- 代码生成表列 +CREATE TABLE js_gen_table_column +( + id varchar(64) NOT NULL, + table_name varchar(64) NOT NULL, + column_name varchar(64) NOT NULL, + column_sort decimal(10), + column_type varchar(100) NOT NULL, + column_label varchar(50), + comments varchar(500) NOT NULL, + attr_name varchar(200) NOT NULL, + attr_type varchar(200) NOT NULL, + is_pk char(1), + is_null char(1), + is_insert char(1), + is_update char(1), + is_list char(1), + is_query char(1), + query_type varchar(200), + is_edit char(1), + show_type varchar(200), + options varchar(1000), + PRIMARY KEY (id) +) WITHOUT OIDS; + + -- 行政区划 CREATE TABLE js_sys_area ( @@ -734,6 +788,8 @@ CREATE TABLE js_sys_user_role /* Create Indexes */ +CREATE INDEX idx_gen_table_ptn ON js_gen_table (); +CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (); CREATE INDEX idx_sys_area_pc ON js_sys_area (parent_code); CREATE INDEX idx_sys_area_ts ON js_sys_area (tree_sort); CREATE INDEX idx_sys_area_status ON js_sys_area (status); @@ -861,6 +917,46 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code); /* Comments */ +COMMENT ON TABLE js_gen_table IS '代码生成表'; +COMMENT ON COLUMN js_gen_table.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; +COMMENT ON COLUMN js_gen_table.comments IS '表说明'; +COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; +COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; +COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; +COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; +COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; +COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; +COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; +COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; +COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; +COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; +COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; +COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; +COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; +COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; +COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; +COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; +COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; +COMMENT ON COLUMN js_gen_table_column.id IS '编号'; +COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; +COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; +COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; +COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; +COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; +COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; +COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; +COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; +COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; +COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; +COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; +COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; +COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; +COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; +COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; +COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; +COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; +COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; COMMENT ON TABLE js_sys_area IS '行政区划'; COMMENT ON COLUMN js_sys_area.area_code IS '区域编码'; COMMENT ON COLUMN js_sys_area.parent_code IS '父级编号'; diff --git a/web/db/postgresql/gen.sql b/web/db/postgresql/gen.sql deleted file mode 100644 index c55e39a7..00000000 --- a/web/db/postgresql/gen.sql +++ /dev/null @@ -1,116 +0,0 @@ - -/* Drop Tables */ - -DROP TABLE IF EXISTS js_gen_table_column; -DROP TABLE IF EXISTS js_gen_table; - - - - -/* Create Tables */ - --- 代码生成表 -CREATE TABLE js_gen_table -( - table_name varchar(64) NOT NULL, - class_name varchar(100) NOT NULL, - comments varchar(500) NOT NULL, - parent_table_name varchar(64), - parent_table_fk_name varchar(64), - tpl_category varchar(200), - package_name varchar(500), - module_name varchar(30), - sub_module_name varchar(30), - function_name varchar(200), - function_name_simple varchar(50), - function_author varchar(50), - gen_base_dir varchar(1000), - options varchar(1000), - create_by varchar(64) NOT NULL, - create_date timestamp NOT NULL, - update_by varchar(64) NOT NULL, - update_date timestamp NOT NULL, - remarks varchar(500), - PRIMARY KEY (table_name) -) WITHOUT OIDS; - - --- 代码生成表列 -CREATE TABLE js_gen_table_column -( - id varchar(64) NOT NULL, - table_name varchar(64) NOT NULL, - column_name varchar(64) NOT NULL, - column_sort decimal(10), - column_type varchar(100) NOT NULL, - column_label varchar(50), - comments varchar(500) NOT NULL, - attr_name varchar(200) NOT NULL, - attr_type varchar(200) NOT NULL, - is_pk char(1), - is_null char(1), - is_insert char(1), - is_update char(1), - is_list char(1), - is_query char(1), - query_type varchar(200), - is_edit char(1), - show_type varchar(200), - options varchar(1000), - PRIMARY KEY (id) -) WITHOUT OIDS; - - - -/* Create Indexes */ - -CREATE INDEX idx_gen_table_ptn ON js_gen_table (parent_table_name); -CREATE INDEX idx_gen_table_column_tn ON js_gen_table_column (table_name); - - - -/* Comments */ - -COMMENT ON TABLE js_gen_table IS '代码生成表'; -COMMENT ON COLUMN js_gen_table.table_name IS '表名'; -COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称'; -COMMENT ON COLUMN js_gen_table.comments IS '表说明'; -COMMENT ON COLUMN js_gen_table.parent_table_name IS '关联父表的表名'; -COMMENT ON COLUMN js_gen_table.parent_table_fk_name IS '本表关联父表的外键名'; -COMMENT ON COLUMN js_gen_table.tpl_category IS '使用的模板'; -COMMENT ON COLUMN js_gen_table.package_name IS '生成包路径'; -COMMENT ON COLUMN js_gen_table.module_name IS '生成模块名'; -COMMENT ON COLUMN js_gen_table.sub_module_name IS '生成子模块名'; -COMMENT ON COLUMN js_gen_table.function_name IS '生成功能名'; -COMMENT ON COLUMN js_gen_table.function_name_simple IS '生成功能名（简写）'; -COMMENT ON COLUMN js_gen_table.function_author IS '生成功能作者'; -COMMENT ON COLUMN js_gen_table.gen_base_dir IS '生成基础路径'; -COMMENT ON COLUMN js_gen_table.options IS '其它生成选项'; -COMMENT ON COLUMN js_gen_table.create_by IS '创建者'; -COMMENT ON COLUMN js_gen_table.create_date IS '创建时间'; -COMMENT ON COLUMN js_gen_table.update_by IS '更新者'; -COMMENT ON COLUMN js_gen_table.update_date IS '更新时间'; -COMMENT ON COLUMN js_gen_table.remarks IS '备注信息'; -COMMENT ON TABLE js_gen_table_column IS '代码生成表列'; -COMMENT ON COLUMN js_gen_table_column.id IS '编号'; -COMMENT ON COLUMN js_gen_table_column.table_name IS '表名'; -COMMENT ON COLUMN js_gen_table_column.column_name IS '列名'; -COMMENT ON COLUMN js_gen_table_column.column_sort IS '列排序（升序）'; -COMMENT ON COLUMN js_gen_table_column.column_type IS '类型'; -COMMENT ON COLUMN js_gen_table_column.column_label IS '列标签名'; -COMMENT ON COLUMN js_gen_table_column.comments IS '列备注说明'; -COMMENT ON COLUMN js_gen_table_column.attr_name IS '类的属性名'; -COMMENT ON COLUMN js_gen_table_column.attr_type IS '类的属性类型'; -COMMENT ON COLUMN js_gen_table_column.is_pk IS '是否主键'; -COMMENT ON COLUMN js_gen_table_column.is_null IS '是否可为空'; -COMMENT ON COLUMN js_gen_table_column.is_insert IS '是否插入字段'; -COMMENT ON COLUMN js_gen_table_column.is_update IS '是否更新字段'; -COMMENT ON COLUMN js_gen_table_column.is_list IS '是否列表字段'; -COMMENT ON COLUMN js_gen_table_column.is_query IS '是否查询字段'; -COMMENT ON COLUMN js_gen_table_column.query_type IS '查询方式'; -COMMENT ON COLUMN js_gen_table_column.is_edit IS '是否编辑字段'; -COMMENT ON COLUMN js_gen_table_column.show_type IS '表单类型'; -COMMENT ON COLUMN js_gen_table_column.options IS '其它生成选项'; - - - diff --git a/web/src/test/java/com/jeesite/test/InitCoreData.java b/web/src/test/java/com/jeesite/test/InitCoreData.java index 8102e3fd..bad34db3 100644 --- a/web/src/test/java/com/jeesite/test/InitCoreData.java +++ b/web/src/test/java/com/jeesite/test/InitCoreData.java @@ -35,6 +35,8 @@ public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData { initCompany(); initPost(); initEmpUser(); + initGenTestData(); + initGenTreeData(); } } diff --git a/web/src/test/java/com/jeesite/test/InitGenData.java b/web/src/test/java/com/jeesite/test/InitGenData.java deleted file mode 100644 index 42597035..00000000 --- a/web/src/test/java/com/jeesite/test/InitGenData.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - */ -package com.jeesite.test; - -import org.junit.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; -import org.springframework.test.context.ActiveProfiles; - -import com.jeesite.modules.config.Application; - -/** - * 初始化代码生成表测试数据 - * @author ThinkGem - * @version 2017-10-22 - */ -@ActiveProfiles("test") -@SpringBootTest(classes=Application.class) -@Rollback(false) -public class InitGenData extends com.jeesite.modules.gen.db.InitGenData { - - @Test - public void initGenData() throws Exception{ - createGenTable(); - initGenTestData(); - initGenTreeData(); - } - -}