微网格管理修改为分页

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;
+}

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<java.util.List < com.epmet.dto.result.HouseInfoDTO>>
      * @Author: lichao
      * @Date: 2023/11/23 16:57
      */
     @GetMapping("getMicroGridHouseList")
-    public Result<List<HouseInfoDTO>> getMicroGridHouseList(String microGridId) {
+    public Result<PageData<HouseInfoDTO>> getMicroGridHouseList(HouseMicroGridPageFormDTO dto) {
-        List<HouseInfoDTO> result = houseService.getMicroGridHouseList(microGridId);
+        PageData<HouseInfoDTO> result = houseService.getMicroGridHouseList(dto);
         return new Result().ok(result);
     }
     /**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -194,7 +194,7 @@ public interface HouseService {
      */
     Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
 
-    List<HouseInfoDTO> getMicroGridHouseList(String microGridId);
+    PageData<HouseInfoDTO> getMicroGridHouseList(HouseMicroGridPageFormDTO dto);
 
     boolean addMicroGridHouse(HouseAddMicroGridFormDTO dto);
 

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<HouseInfoDTO> getMicroGridHouseList(String microGridId) {
+    public PageData<HouseInfoDTO> getMicroGridHouseList(HouseMicroGridPageFormDTO dto) {
-        return icHouseDao.getMicroGridHouseList(microGridId);
+
+        PageHelper.startPage(dto.getPageNo(),dto.getPageSize());
+        List<HouseInfoDTO> list = icHouseDao.getMicroGridHouseList(dto.getMicroGridId());
+        PageInfo<HouseInfoDTO> result = new PageInfo<>(list);
+        return new PageData<>(list,result.getTotal());
     }
 
     @Override

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -549,7 +549,7 @@
         and DOOR_NAME = #{doorName}
     </select>
     <select id="getMicroGridHouseList" resultType="com.epmet.dto.result.HouseInfoDTO">
-        select *
+        select *,ID as homeId
         from ic_house
         where del_flag = '0'
          and MICRO_GRID_ID = #{microGridId}