diff --git a/platform-common/src/main/java/com/lyms/platform/common/core/resolve/MessageResolver.java b/platform-common/src/main/java/com/lyms/platform/common/core/resolve/MessageResolver.java index 7eb4835..9288664 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/core/resolve/MessageResolver.java +++ b/platform-common/src/main/java/com/lyms/platform/common/core/resolve/MessageResolver.java @@ -36,4 +36,8 @@ public class MessageResolver implements InitializingBean { public String getErrorMessage(String key) { return messageMapHolder.getProperty(key); } + + public void setMessageFile(String messageFile) { + this.messageFile = messageFile; + } } \ No newline at end of file diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml index 33c741d..470e7f3 100644 --- a/platform-operate-api/pom.xml +++ b/platform-operate-api/pom.xml @@ -9,9 +9,9 @@ 4.0.0 war platform-operate-api - + - + com.lyms.core platform-common @@ -43,41 +43,26 @@ 1.7 1.7 + ${maven.compiler.encoding} + + org.apache.maven.plugins + maven-resources-plugin + 2.6 + + ${project.build.sourceEncoding} + + platform-operate-api - + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java index d58650b..8f6069a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java @@ -2,8 +2,10 @@ package com.lyms.platform.operate.web.controller; import java.util.List; +import com.lyms.platform.common.core.resolve.MessageResolver; import com.lyms.platform.common.result.BaseResponse; import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.validation.BindException; import org.springframework.validation.BindingResult; @@ -16,7 +18,10 @@ import org.springframework.web.bind.annotation.ResponseStatus; public class RestController { private static final int ARG_ERROR = 4039; - + + @Autowired + private MessageResolver messageResolver; + @ExceptionHandler(MethodArgumentNotValidException.class) @ResponseStatus(HttpStatus.OK) @ResponseBody @@ -41,8 +46,8 @@ public class RestController { .get(0); error.setErrorcode(ARG_ERROR ); - error.setErrormsg(fieldError - .getDefaultMessage()); + error.setErrormsg(messageResolver.getErrorMessage(fieldError + .getDefaultMessage())); } return error; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java index 44e18f3..782a810 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java @@ -4,7 +4,6 @@ import java.util.Date; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.common.result.BaseModel; /** * 新生儿管理请求 @@ -12,7 +11,7 @@ import com.lyms.platform.common.result.BaseModel; * @author Administrator */ @Form -public class BabyManagerQueryRequest extends BaseModel { +public class BabyManagerQueryRequest extends BasePageQueryRequest { /** * @@ -44,17 +43,6 @@ public class BabyManagerQueryRequest extends BaseModel { @FormParam private Date dEnd; - /** - * 页数 - */ - @FormParam - private int page; - - /** - * 行数 - */ - @FormParam - private int limit; public String getKeyword() { @@ -89,19 +77,10 @@ public class BabyManagerQueryRequest extends BaseModel { this.dEnd = new Date(dEnd * 1000); } - - public int getPage() { - return page; - } - public void setPage(int page) { this.page = page; } - public int getLimit() { - return limit; - } - public void setLimit(int limit) { this.limit = limit; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java new file mode 100644 index 0000000..3aba66a --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java @@ -0,0 +1,45 @@ +package com.lyms.platform.operate.web.request; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.result.BaseModel; + +/** + * + * 分页查询的基础请求 + * + * @author Administrator + * + */ +public class BasePageQueryRequest extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + @Min(value=1,message="page.min") + @FormParam + @NotNull(message="page.must.not.null") + protected Integer page; + @NotNull(message="page.limit.must.not.null") + @Min(value=1,message="page.min") + @Max(value=40,message="page.max") + @FormParam + protected Integer limit; + public Integer getPage() { + return page; + } + public void setPage(Integer page) { + this.page = page; + } + public Integer getLimit() { + return limit; + } + public void setLimit(Integer limit) { + this.limit = limit; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java index aba5928..1ebe480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java @@ -11,7 +11,6 @@ import com.lyms.platform.pojo.BasicConfig; public class BasicConfigAddRequest implements IBasicRequestConvert{ @FormParam private String parentId; - @FormParam private String name; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java index 51d2d50..1e6f5ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java @@ -1,7 +1,5 @@ package com.lyms.platform.operate.web.request; -import javax.validation.constraints.Min; - import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; @@ -12,31 +10,19 @@ import com.lyms.platform.common.core.annotation.form.FormParam; * */ @Form -public class BasicConfigQueryRequest { +public class BasicConfigQueryRequest extends BasePageQueryRequest { + /** + * + */ + private static final long serialVersionUID = 1L; + @FormParam private String keywords; - @Min(value=1,message="page不能小于1.") - @FormParam - private int page; - @Min(value=1,message="limit不能小于1.") - @FormParam - private int limit; + public String getKeywords() { return keywords; } public void setKeywords(String keywords) { this.keywords = keywords; } - public int getPage() { - return page; - } - public void setPage(int page) { - this.page = page; - } - public int getLimit() { - return limit; - } - public void setLimit(int limit) { - this.limit = limit; - } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java index c2d2f7c..1fcd8de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java @@ -4,7 +4,6 @@ import java.util.Date; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.common.result.BaseModel; /** * 产妇管理请求 @@ -12,7 +11,7 @@ import com.lyms.platform.common.result.BaseModel; * @author Administrator */ @Form -public class PuerperaManagerQueryRequest extends BaseModel { +public class PuerperaManagerQueryRequest extends BasePageQueryRequest { /** * @@ -49,17 +48,6 @@ public class PuerperaManagerQueryRequest extends BaseModel { @FormParam private Date dueDateEnd; - /** - * 页数 - */ - @FormParam - private int page; - - /** - * 行数 - */ - @FormParam - private int limit; public String getCommunityId() { return communityId; @@ -100,20 +88,4 @@ public class PuerperaManagerQueryRequest extends BaseModel { public void setDueDateEnd(long dueDateEnd) { this.dueDateEnd = new Date(dueDateEnd * 1000); } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public int getLimit() { - return limit; - } - - public void setLimit(int limit) { - this.limit = limit; - } -} +} \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 311ca11..ee5047a 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -4,4 +4,6 @@ mongo.db.host=localhost mongo.db.port=27017 -mongo.db.dbname=platform \ No newline at end of file +mongo.db.dbname=platform +mongo.db.username=root +mongo.db.password=root \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/message.properties b/platform-operate-api/src/main/resources/message.properties new file mode 100644 index 0000000..bd145cf --- /dev/null +++ b/platform-operate-api/src/main/resources/message.properties @@ -0,0 +1,4 @@ +page.min=\u5206\u9875\u6570\u636E\u4E0D\u80FD\u5C0F\u4E8E1. +page.max=\u6BCF\u9875\u663E\u793A\u7684\u6570\u636E\u4E0D\u80FD\u5927\u4E8E40\u6761 +page.must.not.null=page\u4E0D\u80FD\u4E3A\u7A7A +page.limit.must.not.null=limit\u4E0D\u80FD\u4E3A\u7A7A diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml index 5fccd37..4453e62 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml @@ -17,6 +17,11 @@ + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ddb3659..d1ba59f 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,11 @@ 3.2.4.RELEASE 1.5.6.RELEASE 1.0.0 + + UTF-8 + UTF-8 + + UTF-8