diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index 75eadad..d7bf28a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -5,6 +5,8 @@ import java.util.List; import javax.validation.Valid; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.operate.web.result.FrontEndResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -46,8 +48,9 @@ public class BasicConfigController extends RestController { */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfig") @ResponseBody - public BaseListResponse queryBasicConfig(@Valid BasicConfigQueryRequest basicConfigQueryRequest) { - return basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); + public FrontEndResult queryBasicConfig(@Valid BasicConfigQueryRequest basicConfigQueryRequest) { + BaseListResponse baseListResponse = basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); + return FrontEndResult.ini().setData(baseListResponse.getData()).setPageInfo(basicConfigQueryRequest.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 33759d2..2a55b58 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -47,6 +47,11 @@ public class BasicConfigFacade { dataList.add(basicConfigResult); } } + basicConfigQueryRequest.setCount(basicConfigQuery.getCount()); + basicConfigQueryRequest.setLimit(basicConfigQuery.getLimit()); + basicConfigQueryRequest.setPage(basicConfigQuery.getPage()); + basicConfigQueryRequest.setLastPage(basicConfigQuery.getLastPage()); + return new BaseListResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } 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 1e6f5ba..3351554 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.dao.BaseQuery; /** * 基础项查询对象封装 @@ -10,7 +11,7 @@ import com.lyms.platform.common.core.annotation.form.FormParam; * */ @Form -public class BasicConfigQueryRequest extends BasePageQueryRequest { +public class BasicConfigQueryRequest extends BaseQuery { /** * */