diff --git a/hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql b/hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql index 7926d06ae..2f72cb6e3 100644 --- a/hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql +++ b/hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql @@ -64,7 +64,7 @@ ALTER TABLE `s_template` COMMENT '模板'; -- Table structure for S_MODULES -- ---------------------------- CREATE TABLE `s_modules` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `name` VARCHAR(256) NOT NULL COMMENT '模块名称', @@ -87,7 +87,7 @@ ALTER TABLE `s_modules` COMMENT '系统模块'; CREATE TABLE `s_module_meta` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `key` VARCHAR(256) NOT NULL COMMENT '标识', @@ -118,7 +118,7 @@ INSERT INTO `s_modules` VALUES ('s_logger', '日志管理', 'admin/logger/list.h -- Table structure for S_RESOURCES -- ---------------------------- CREATE TABLE `s_resources` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `name` VARCHAR(256) NOT NULL COMMENT '资源名称', @@ -159,7 +159,7 @@ ALTER TABLE `s_resources` COMMENT '资源表'; -- Table structure for S_ROLE -- ---------------------------- CREATE TABLE `s_role` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `name` VARCHAR(256) NOT NULL COMMENT '角色名称', @@ -179,7 +179,7 @@ INSERT INTO `s_role` VALUES ('admin', '超级管理员', NULL, '初始数据'); -- Table structure for S_ROLE_MODULES -- ---------------------------- CREATE TABLE `s_role_modules` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `module_id` VARCHAR(256) NOT NULL COMMENT '模块id', @@ -194,7 +194,7 @@ ALTER TABLE `s_role_modules` COMMENT '角色模块绑定表'; -- Table structure for S_SCRIPT -- ---------------------------- CREATE TABLE `s_script` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'uid', `name` VARCHAR(256) NOT NULL COMMENT '脚本名称', @@ -219,7 +219,7 @@ ALTER TABLE `s_script` COMMENT '脚本'; -- Table structure for S_USER -- ---------------------------- CREATE TABLE `s_user` ( - `u_id` VARCHAR(64) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'ID', `username` VARCHAR(64) NOT NULL COMMENT '用户名', @@ -245,12 +245,12 @@ ALTER TABLE `s_user` COMMENT '用户表'; -- ---------------------------- -- Records of S_USER -- ---------------------------- -INSERT INTO `s_user` VALUES ('admin', 'admin', '23ec59e119da971084cbd0ba72d230a0', '超级管理员', NULL, NULL, '1', TO_datetime('2015-11-19 12:10:36', 'YYYY-MM-DD HH24:MI:SS'), NULL, NULL); +INSERT INTO `s_user` VALUES ('admin', 'admin', '23ec59e119da971084cbd0ba72d230a0', '超级管理员', NULL, NULL, '1', '1991-08-11 12:10:36', NULL, NULL); -- ---------------------------- -- Table structure for S_USER_ROLE -- ---------------------------- CREATE TABLE `s_user_role` ( - `u_id` VARCHAR(256) NOT NULL PRIMARY KEY + `u_id` VARCHAR(32) NOT NULL PRIMARY KEY COMMENT 'UID', `user_id` VARCHAR(256) NOT NULL COMMENT '用户ID', diff --git a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java index 45f6b09fb..31d53cace 100644 --- a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java +++ b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java @@ -32,9 +32,6 @@ public class FormController extends GenericController { @Resource private FormService formService; - @Resource - private HistoryService historyService; - @Override public FormService getService() { return this.formService; diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java b/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java index 4291214a8..557021ce5 100644 --- a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java +++ b/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/DefaultSqlParamBuilder.java @@ -24,21 +24,20 @@ import java.util.*; */ public class DefaultSqlParamBuilder { - public String getQuoteStart() { - return "\""; - } - - public String getQuoteEnd() { - return "\""; - } - public Dialect getDialect() { return Dialect.ORACLE; } + public boolean filedToUpperCase() { + return true; + } + protected static final Map simpleName = new HashMap<>(); + private static DefaultSqlParamBuilder instance = new DefaultSqlParamBuilder(); - protected PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils(); + + protected PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils(); + public DefaultSqlParamBuilder() { simpleName.put(Integer.class, "int"); simpleName.put(Byte.class, "byte"); @@ -124,7 +123,10 @@ public class DefaultSqlParamBuilder { listData = Arrays.asList(param.getData()); } param.setData(listData); - String fields = mappings.keySet().stream().reduce((f1, f2) -> f1 + "," + f2).get(); + String fields = mappings.keySet().stream() + .map(str -> new SqlAppender().add(getDialect().getQuoteStart(), filedToUpperCase() ? str.toUpperCase() : str, getDialect().getQuoteEnd()).toString()) + .reduce((f1, f2) -> new SqlAppender().add(f1, ",", f2) + .toString()).get(); //批量 int size = listData.size(); SqlAppender batchSql = new SqlAppender(); @@ -164,11 +166,11 @@ public class DefaultSqlParamBuilder { if (!appender.isEmpty()) appender.add(","); if (!k.contains(".") || k.split("[.]")[0].equals(tableName)) { - appender.add(tableName, ".", k, " as "); + appender.add(tableName, ".", getDialect().getQuoteStart(), filedToUpperCase() ? k.toUpperCase() : k, getDialect().getQuoteEnd(), " as "); } else { - appender.add(k, " as "); + appender.add(getDialect().getQuoteStart(), filedToUpperCase() ? k.toUpperCase() : k, getDialect().getQuoteEnd(), " as "); } - appender.addEdSpc(getQuoteStart(), k, getQuoteEnd()); + appender.addEdSpc(getDialect().getQuoteStart(), k, getDialect().getQuoteEnd()); }); if (appender.isEmpty()) return "*"; return appender.toString(); @@ -187,7 +189,7 @@ public class DefaultSqlParamBuilder { if (!appender.isEmpty()) appender.add(","); Map config = ((Map) fieldConfig.get(k)); - appender.add(k, "=", "#{data.", v); + appender.add(getDialect().getQuoteStart(), filedToUpperCase() ? k.toUpperCase() : k, getDialect().getQuoteEnd(), "=", "#{data.", v); if (config != null) { Object jdbcType = config.get("jdbcType"), javaType = config.get("javaType"); diff --git a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java b/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java index c0307d9f7..fd4f8dbef 100644 --- a/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java +++ b/hsweb-web-dao-impl-mybatis/src/main/java/org/hsweb/web/mybatis/builder/MysqlParamBuilder.java @@ -11,6 +11,11 @@ public class MysqlParamBuilder extends DefaultSqlParamBuilder { public MysqlParamBuilder() { } + @Override + public boolean filedToUpperCase() { + return false; + } + @Override public Dialect getDialect() { return Dialect.MYSQL; @@ -20,13 +25,4 @@ public class MysqlParamBuilder extends DefaultSqlParamBuilder { return instance; } - @Override - public String getQuoteStart() { - return "`"; - } - - @Override - public String getQuoteEnd() { - return "`"; - } } diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml b/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml index 9e416159e..c6a14e61b 100644 --- a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml +++ b/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/basic/BasicMapper.xml @@ -5,44 +5,56 @@ - ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildWhere(resultMapId,$tableName,#this['_parameter'].terms)} + ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildWhere(resultMapId,tableName,#this['_parameter'].terms)} + - ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildSelectFields(resultMapId,#this['_parameter'])} + ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildSelectFields(resultMapId,tableName,#this['_parameter'])} - - ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildUpdateFields(resultMapId,#this['_parameter'])} - + + ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildUpdateFields(resultMapId,#this['_parameter'])} + - ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildOrder(resultMapId,$tableName,#this['_parameter'])} + ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildOrder(resultMapId,tableName,#this['_parameter'])} select - from ${$tableName} + from ${tableName} + + + delete ${tableName} from ${tableName} + + + + 1=2 + + + + - insert into ${tableName} ${@org.hsweb.web.mybatis.builder.DefaultSqlParamBuilder@instance().buildInsertSql(resultMapId,#this['_parameter'])} + insert into ${tableName} ${@org.hsweb.web.mybatis.builder.MysqlParamBuilder@instance().buildInsertSql(resultMapId,#this['_parameter'])} - update ${$tableName} + update ${tableName} @@ -51,19 +63,10 @@ - - - delete from ${tableName} - - - - u_id is null - - - + - select count(0) as "total" from ${$tableName} + select count(0) as "total" from ${tableName} diff --git a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml b/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml index 11885b6d9..77619aeff 100644 --- a/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml +++ b/hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml @@ -45,7 +45,7 @@