yonge 6 years ago
parent
commit
a3148b76ff

+ 60 - 0
mec-common/common-core/src/main/java/com/ym/mec/common/config/DateConverterConfig.java

@@ -0,0 +1,60 @@
+package com.ym.mec.common.config;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DateConverterConfig implements Converter<String, Date> {
+
+	private static final List<String> formarts = new ArrayList<String>(4);
+
+	static {
+		formarts.add("yyyy-MM");
+		formarts.add("yyyy-MM-dd");
+		formarts.add("yyyy-MM-dd HH:mm");
+		formarts.add("yyyy-MM-dd HH:mm:ss");
+	}
+
+	@Override
+	public Date convert(String source) {
+		String value = source.trim();
+		if ("".equals(value)) {
+			return null;
+		}
+		if (source.matches("^\\d{4}-\\d{1,2}$")) {
+			return parseDate(source, formarts.get(0));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
+			return parseDate(source, formarts.get(1));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")) {
+			return parseDate(source, formarts.get(2));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
+			return parseDate(source, formarts.get(3));
+		} else {
+			throw new IllegalArgumentException("Invalid boolean value '" + source + "'");
+		}
+	}
+
+	/**
+	 * 格式化日期
+	 * @param dateStr String 字符型日期
+	 * @param format String 格式
+	 * @return Date 日期
+	 */
+	public Date parseDate(String dateStr, String format) {
+		Date date = null;
+		try {
+			DateFormat dateFormat = new SimpleDateFormat(format);
+			date = dateFormat.parse(dateStr);
+		} catch (Exception e) {
+
+		}
+		return date;
+	}
+
+}

+ 1 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/dal/IntEnumTypeHandler.java

@@ -8,7 +8,7 @@ import java.sql.SQLException;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 
-import com.ym.mec.common.dal.base.BaseIntEnum;
+import com.ym.mec.common.enums.BaseIntEnum;
 
 /**
  * 枚举类转换器

+ 1 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/dal/StringEnumTypeHandler.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 
-import com.ym.mec.common.dal.base.BaseStringEnum;
+import com.ym.mec.common.enums.BaseStringEnum;
 
 /**
  * 枚举类转换器

+ 0 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/enums/AccessSource.java

@@ -1,6 +1,5 @@
 package com.ym.mec.common.enums;
 
-import com.ym.mec.common.dal.base.BaseIntEnum;
 
 /** 
  * @author sunzl 

+ 1 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseIntEnum.java → mec-common/common-core/src/main/java/com/ym/mec/common/enums/BaseIntEnum.java

@@ -1,4 +1,4 @@
-package com.ym.mec.common.dal.base;
+package com.ym.mec.common.enums;
 
 /**
  * 枚举类基础类

+ 1 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/dal/base/BaseStringEnum.java → mec-common/common-core/src/main/java/com/ym/mec/common/enums/BaseStringEnum.java

@@ -1,4 +1,4 @@
-package com.ym.mec.common.dal.base;
+package com.ym.mec.common.enums;
 
 /**
  * 枚举类基础类