diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseMicroGridPageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseMicroGridPageFormDTO.java new file mode 100644 index 0000000000..3a5725fc27 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseMicroGridPageFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description + * @Author lc + * @Date 2022/6/28 15:06 + */ +@Data +public class HouseMicroGridPageFormDTO extends PageFormDTO implements Serializable { + + public interface HouseMicroGridPage { + } + + @NotNull(message = "microGridId不可为空",groups = HouseMicroGridPageFormDTO.HouseMicroGridPage.class) + private String microGridId; + private Integer pageNo; + + + private Integer pageSize; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 2e4097479f..9ad65aebe9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -617,14 +617,14 @@ public class HouseController implements ResultDataResolver { } /** * @Description: 获取微网格列表 - * @param microGridId: + * @param dto: * @Return com.epmet.commons.tools.utils.Result> * @Author: lichao * @Date: 2023/11/23 16:57 */ @GetMapping("getMicroGridHouseList") - public Result> getMicroGridHouseList(String microGridId) { - List result = houseService.getMicroGridHouseList(microGridId); + public Result> getMicroGridHouseList(HouseMicroGridPageFormDTO dto) { + PageData result = houseService.getMicroGridHouseList(dto); return new Result().ok(result); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index b58cea97b4..533004edb5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -194,7 +194,7 @@ public interface HouseService { */ Result getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO); - List getMicroGridHouseList(String microGridId); + PageData getMicroGridHouseList(HouseMicroGridPageFormDTO dto); boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 411c61ee81..340ebf16ca 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1313,8 +1313,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public List getMicroGridHouseList(String microGridId) { - return icHouseDao.getMicroGridHouseList(microGridId); + public PageData getMicroGridHouseList(HouseMicroGridPageFormDTO dto) { + + PageHelper.startPage(dto.getPageNo(),dto.getPageSize()); + List list = icHouseDao.getMicroGridHouseList(dto.getMicroGridId()); + PageInfo result = new PageInfo<>(list); + return new PageData<>(list,result.getTotal()); } @Override diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 6e21489b13..26a4fd87a5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -549,7 +549,7 @@ and DOOR_NAME = #{doorName}