Merge branch 'master' of https://gitee.com/zouxuan/mec

cms/src/main/java/com/ym/mec/cms/config/WebMvcConfig.java

@@ -0,0 +1,19 @@
+package com.ym.mec.cms.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import com.ym.mec.common.config.EnumConverterFactory;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+	/**
+	 * 枚举类的转换器 addConverterFactory
+	 */
+	@Override
+	public void addFormatters(FormatterRegistry registry) {
+		registry.addConverterFactory(new EnumConverterFactory());
+	}
+}

cms/src/main/java/com/ym/mec/cms/controller/queryinfo/NewsInformationQueryInfo.java

@@ -2,6 +2,8 @@ package com.ym.mec.cms.controller.queryinfo;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 import com.ym.mec.cms.dal.entity.NewsStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 
@@ -15,6 +17,8 @@ public class NewsInformationQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "标题", required = false)
 	private String title;
+	
+	private Date date;
 
 	public Integer getType() {
 		return type;
@@ -39,4 +43,12 @@ public class NewsInformationQueryInfo extends QueryInfo {
 	public void setTitle(String title) {
 		this.title = title;
 	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
 }

mec-common/common-core/src/main/java/com/ym/mec/common/config/DateConverterConfig.java → mec-common/common-core/src/main/java/com/ym/mec/common/config/DateConverter.java

@@ -10,7 +10,7 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
 @Component
-public class DateConverterConfig implements Converter<String, Date> {
+public class DateConverter implements Converter<String, Date> {
 
 	private static final List<String> formarts = new ArrayList<String>(4);
 

mec-common/common-core/src/main/java/com/ym/mec/common/config/EnumConverterConfig.java → mec-common/common-core/src/main/java/com/ym/mec/common/config/EnumConverter.java

@@ -1,19 +1,23 @@
 package com.ym.mec.common.config;
 
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Component;
 
 import com.ym.mec.common.enums.BaseEnum;
 
-@Component
-public class EnumConverterConfig implements Converter<String, BaseEnum<?, ?>> {
+public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String, T> {
+
+	private Class<T> enumType;
+
+	public EnumConverter(Class<T> enumType) {
+		this.enumType = enumType;
+	}
 
 	@Override
-	public BaseEnum<?, ?> convert(String source) {
-		return getEnum(BaseEnum.class, source);
+	public T convert(String source) {
+		return getEnum(enumType, source);
 	}
 
-	private <T extends BaseEnum<?, ?>> T getEnum(Class<T> targerType, String source) {
+	private T getEnum(Class<T> targerType, String source) {
 		for (T en : targerType.getEnumConstants()) {
 			if (en.getCode() instanceof Integer) {
 				if ((int) en.getCode() == Integer.parseInt(source.toString())) {

mec-common/common-core/src/main/java/com/ym/mec/common/config/EnumConverterFactory.java

@@ -0,0 +1,17 @@
+package com.ym.mec.common.config;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.stereotype.Component;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+@Component
+public class EnumConverterFactory implements ConverterFactory<String, BaseEnum<?, ?>> {
+
+	@Override
+	public <T extends BaseEnum<?, ?>> Converter<String, T> getConverter(Class<T> targetType) {
+		return new EnumConverter<T>(targetType);
+	}
+
+}