获取社区下小区列表

epmet-gateway/src/main/resources/bootstrap.yml

@@ -500,6 +500,7 @@ epmet:
     - /epmet/point/mqCallback/**
     - /tduck-api/**
     #查询楼栋，单元，房屋
+    - /gov/org/icneighborhood/open/list
     - /gov/org/icbuilding/buildingoption
     - /gov/org/icbuildingunit/unitoption
     - /gov/org/ichouse/houseoption

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodFormDTO.java

@@ -17,17 +17,17 @@
 
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 
 
 
 @Data
-public class IcNeighborHoodFormDTO implements Serializable {
+public class IcNeighborHoodFormDTO extends PageFormDTO {
 
     private static final long serialVersionUID = 1L;
 
@@ -102,4 +102,4 @@ public class IcNeighborHoodFormDTO implements Serializable {
 
 
 
-}
+}

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -35,6 +35,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcNeighborHoodDTO;
+import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
@@ -77,6 +78,12 @@ public class IcNeighborHoodController {
         return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
     }
 
+    @PostMapping("open/list")
+    public Result<PageData<IcNeighborHoodDTO>> openList(@RequestBody IcNeighborHoodFormDTO params){
+        PageData<IcNeighborHoodDTO> page = icNeighborHoodService.openPage(params);
+        return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<IcNeighborHoodDTO> get(@PathVariable("id") String id){
         IcNeighborHoodDTO data = icNeighborHoodService.get(id);

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

@@ -23,12 +23,12 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
 import com.epmet.entity.IcPropertyManagementEntity;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -148,4 +148,11 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
     void neighborHoodPropertyInsert(List<IcNeighborHoodPropertyEntity> entities);
 
     <T> String orgGeneralImport(Collection<?> errorRows, Class<T> tClass) throws IOException;
-}
+
+    /**
+     * desc:开发获取小区列表 分页或不分页
+     * @param params
+     * @return
+     */
+    PageData<IcNeighborHoodDTO> openPage(IcNeighborHoodFormDTO params);
+}

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

@@ -48,6 +48,7 @@ import com.epmet.dao.IcBuildingDao;
 import com.epmet.dao.IcNeighborHoodDao;
 import com.epmet.dao.IcPropertyManagementDao;
 import com.epmet.dto.*;
+import com.epmet.dto.form.IcNeighborHoodFormDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
@@ -61,6 +62,8 @@ import com.epmet.model.ImportNeighborHoodInfoListener;
 import com.epmet.model.NeighborHoodInfoModel;
 import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.*;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
@@ -680,4 +683,25 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         return uploadResult.getData().getUrl();
     }
 
+    @Override
+    public PageData<IcNeighborHoodDTO> openPage(IcNeighborHoodFormDTO params) {
+        LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcNeighborHoodEntity::getAgencyId,params.getAgencyId());
+        PageData<IcNeighborHoodDTO> result = null;
+        List<IcNeighborHoodDTO> list = null;
+        if (params.isPage()){
+            Page<IcNeighborHoodEntity> objects = PageHelper.startPage(params.getPageNo(), params.getPageSize()).doSelectPage(() -> {
+                baseDao.selectList(wrapper);
+            });
+            list = ConvertUtils.sourceToTarget(objects.getResult(),IcNeighborHoodDTO.class);
+            result = new PageData<>(list,objects.getTotal());
+            return result;
+        }
+
+        List<IcNeighborHoodEntity> listEntity = baseDao.selectList(wrapper);
+        list = ConvertUtils.sourceToTarget(listEntity,IcNeighborHoodDTO.class);
+        result = new PageData<>(list,list.size());
+        return result;
+    }
+
 }