Skip to content

添加datetimepicker组件，支持日期及时间的选择 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yindz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

添加datetimepicker组件，支持日期及时间的选择 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
833f6d9
原datepicker组件只支持选择日期；添加datetimepicker组件，支持日期及时间的选择
Nov 12, 2018
60772c8
列表页模板增加查询表单和重置按钮，设置唯一表格名称等
Nov 12, 2018
4411655
改进Mybatis XML生成模板，并在插入和更新语句中增加jdbcType
Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions bootdo/src/main/java/com/bootdo/common/domain/ColumnDO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ public class ColumnDO {
private String attrType;
// auto_increment
private String extra;
// jdbcType
private String jdbcType;

public String getColumnName() {
return columnName;
Expand Down Expand Up @@ -90,4 +92,22 @@ public String toString() {
", extra='" + extra + '\'' +
'}';
}

/**
* 获取 jdbcType
*
* @return jdbcType jdbcType
*/
public String getJdbcType() {
return this.jdbcType;
}

/**
* 设置 jdbcType
*
* @param jdbcType jdbcType
*/
public void setJdbcType(String jdbcType) {
this.jdbcType = jdbcType;
}
}
27 changes: 26 additions & 1 deletion bootdo/src/main/java/com/bootdo/common/utils/GenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,33 @@
*/
public class GenUtils {

/**
* MySQL数据类型到mybatis jdbcType的映射关系
*/
private static Map<String, String> mysqlTypeToJdbcTypeMap = new HashMap<>();
static {
mysqlTypeToJdbcTypeMap.put("blob", "BLOB");
mysqlTypeToJdbcTypeMap.put("char", "CHAR");
mysqlTypeToJdbcTypeMap.put("varchar", "VARCHAR");
mysqlTypeToJdbcTypeMap.put("datetime", "TIMESTAMP");
mysqlTypeToJdbcTypeMap.put("timestamp", "TIMESTAMP");
mysqlTypeToJdbcTypeMap.put("time", "TIME");
mysqlTypeToJdbcTypeMap.put("numeric", "NUMERIC");
mysqlTypeToJdbcTypeMap.put("decimal", "DECIMAL");
mysqlTypeToJdbcTypeMap.put("double", "DOUBLE");
mysqlTypeToJdbcTypeMap.put("float", "FLOAT");
mysqlTypeToJdbcTypeMap.put("tinyint", "TINYINT");
mysqlTypeToJdbcTypeMap.put("int", "INTEGER");
mysqlTypeToJdbcTypeMap.put("smallint", "SMALLINT");
mysqlTypeToJdbcTypeMap.put("mediumint", "INTEGER");
mysqlTypeToJdbcTypeMap.put("bigint", "BIGINT");
mysqlTypeToJdbcTypeMap.put("text", "CLOB");
mysqlTypeToJdbcTypeMap.put("real", "REAL");
}


public static List<String> getTemplates() {
List<String> templates = new ArrayList<String>();
List<String> templates = new ArrayList<>();
templates.add("templates/common/generator/domain.java.vm");
templates.add("templates/common/generator/Dao.java.vm");
//templates.add("templates/common/generator/Mapper.java.vm");
Expand Down Expand Up @@ -81,6 +105,7 @@ public static void generatorCode(Map<String, String> table,
//列的数据类型，转换成Java类型
String attrType = config.getString(columnDO.getDataType(), "unknowType");
columnDO.setAttrType(attrType);
columnDO.setJdbcType(mysqlTypeToJdbcTypeMap.getOrDefault(columnDO.getDataType().toLowerCase(), "OTHER"));

//是否主键
if ("PRI".equalsIgnoreCase(column.get("columnKey")) && tableDO.getPk() == null) {
Expand Down
Loading