各种分页接口以及补充注释

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CaResidentFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7243033732302561487L;
+
+    private Integer page;
+
+    private Integer limit;
+
+    private String residentName;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.net.Inet4Address;
+
+@Data
+public class CaRotatorsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3356808153818385932L;
+
+    private String rotatorsName;
+
+    private Integer page;
+    private Integer limit;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java

@@ -0,0 +1,197 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CaResidentResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3876909002181822355L;
+
+    /**
+     * 人口ID
+     */
+    private Long residentId;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 人口性质
+     */
+    private String residentProperty;
+
+    /**
+     * 居民分类
+     */
+    private String residentType;
+
+    /**
+     * 证件类型
+     */
+    private String idType;
+
+    /**
+     * 证件号码（公民身份证号）
+     */
+    private String idCard;
+
+    /**
+     * 姓名
+     */
+    private String residentName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 联系方式
+     */
+    private String telephone;
+
+    /**
+     * 户籍省
+     */
+    private String householdProv;
+
+    /**
+     * 户籍市
+     */
+    private String householdCity;
+
+    /**
+     * 户籍县(区)
+     */
+    private String householdCounty;
+
+    /**
+     * 户籍镇街
+     */
+    private String householdTown;
+
+    /**
+     * 户籍社区/村
+     */
+    private String householdVillage;
+
+    /**
+     * 户籍详址
+     */
+    private String householdAddressDetail;
+
+    /**
+     * 现住省
+     */
+    private String curliveProv;
+
+    /**
+     * 现住市
+     */
+    private String curliveCity;
+
+    /**
+     * 现住县(区)
+     */
+    private String curliveCounty;
+
+    /**
+     * 现住镇街
+     */
+    private String curliveTown;
+
+    /**
+     * 现住社区/村
+     */
+    private String curliveVillage;
+
+    /**
+     * 现住详址
+     */
+    private String curliveAddressDetail;
+
+    /**
+     * 籍贯省
+     */
+    private String nativeAddressProv;
+
+    /**
+     * 籍贯市
+     */
+    private String nativeAddressCity;
+
+    /**
+     * 籍贯县(区)
+     */
+    private String nativeAddressCounty;
+
+    /**
+     * 曾用名
+     */
+    private String formerName;
+
+    /**
+     * 学历
+     */
+    private String education;
+
+    /**
+     * 职业
+     */
+    private String occupation;
+
+    /**
+     * 职业类别
+     */
+    private String occupationType;
+
+    /**
+     * 服务处所
+     */
+    private String serviceAddress;
+
+    /**
+     * 婚姻状况
+     */
+    private String marriageStatus;
+
+    /**
+     * 政治面貌
+     */
+    private String party;
+
+    /**
+     * 宗教信仰
+     */
+    private String religious;
+
+    /**
+     * 有无皈依（已受洗）
+     */
+    private String conversionState;
+
+    /**
+     * 国籍
+     */
+    private String nationality;
+
+    /**
+     * 数据来源
+     */
+    private String platCode;
+}

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java

@@ -0,0 +1,202 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CaRotatorsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -5388784241677803257L;
+
+    /**
+     * 主键id
+     */
+    private Long rotatorsId;
+
+    /**
+     * 公民身份证号
+     */
+    private String idCard;
+
+    /**
+     * 证件类型
+     */
+    private String idType;
+
+    /**
+     * 姓名
+     */
+    private String rotatorsName;
+
+    /**
+     * 曾用名
+     */
+    private String formerName;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 籍贯省
+     */
+    private String nativeAddressProv;
+
+    /**
+     * 籍贯市
+     */
+    private String nativeAddressCity;
+
+    /**
+     * 籍贯县(区)
+     */
+    private String nativeAddressCountry;
+
+    /**
+     * 婚姻状况
+     */
+    private String marriageStatus;
+
+    /**
+     * 政治面貌
+     */
+    private String party;
+
+    /**
+     * 学历
+     */
+    private String education;
+
+    /**
+     * 宗教信仰
+     */
+    private String religious;
+
+    /**
+     * 职业类别
+     */
+    private String occupationType;
+
+    /**
+     * 职业
+     */
+    private String occupation;
+
+    /**
+     * 服务处所
+     */
+    private String serviceAddress;
+
+    /**
+     * 联系方式
+     */
+    private String telephone;
+
+    /**
+     * 户籍地省
+     */
+    private String householdAddressProv;
+
+    /**
+     * 户籍地市
+     */
+    private String householdAddressCity;
+
+    /**
+     * 户籍地县(区)
+     */
+    private String householdAddressCountry;
+
+    /**
+     * 户籍地镇街
+     */
+    private String householdAddressTown;
+
+    /**
+     * 户籍地社区/村
+     */
+    private String householdAddressVillage;
+
+    /**
+     * 户籍门(楼)详址
+     */
+    private String householdAddressDetail;
+
+    /**
+     * 现住地省
+     */
+    private String curliveAddressProv;
+
+    /**
+     * 现住地市
+     */
+    private String curliveAddressCity;
+
+    /**
+     * 现住地县(区)
+     */
+    private String curliveAddressCountry;
+
+    /**
+     * 现住地镇街
+     */
+    private String curliveAddressTown;
+
+    /**
+     * 现住地社区/村
+     */
+    private String curliveAddressVillage;
+
+    /**
+     * 现住门(楼)详址
+     */
+    private String curliveAddressDetail;
+
+    /**
+     * 流入原因
+     */
+    private String inflowReason;
+
+    /**
+     * 办证类型
+     */
+    private String certificateType;
+
+    /**
+     * 证件号码
+     */
+    private String certificateNumber;
+
+    /**
+     * 登记日期
+     */
+    private Date signDate;
+
+    /**
+     * 证件到期日期
+     */
+    private Date endDate;
+
+    /**
+     * 住所类型
+     */
+    private String residenceType;
+
+    /**
+     * 是否重点关注人员
+     */
+    private String isFocusPerson;
+}

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java

@@ -38,20 +38,20 @@ public class CaLoudongController {
     private CaLoudongService caLoudongService;
 
     @RequestMapping("page")
-    public Result<PageData<CaLoudongDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CaLoudongDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CaLoudongDTO> page = caLoudongService.page(params);
         return new Result<PageData<CaLoudongDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<CaLoudongDTO> get(@PathVariable("id") String id){
+    public Result<CaLoudongDTO> get(@PathVariable("id") String id) {
         CaLoudongDTO data = caLoudongService.get(id);
         return new Result<CaLoudongDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CaLoudongDTO dto){
+    public Result save(@RequestBody CaLoudongDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         caLoudongService.save(dto);
@@ -60,7 +60,7 @@ public class CaLoudongController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody CaLoudongDTO dto){
+    public Result update(@RequestBody CaLoudongDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         caLoudongService.update(dto);
@@ -68,7 +68,7 @@ public class CaLoudongController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         caLoudongService.delete(ids);
@@ -81,8 +81,17 @@ public class CaLoudongController {
         ExcelUtils.exportExcelToTarget(response, null, list, CaLoudongExcel.class);
     }
 
+    /**
+     * 楼栋基本信息分页
+     *
+     * @param dto
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.CaLoudongResultDTO>>
+     * @author LZN
+     * @date 2022/5/31 18:57
+     */
     @PostMapping("getPage")
-    public Result<PageData<CaLoudongResultDTO>> getPage(@RequestBody CaLoudongFormDTO dto, @LoginUser TokenDto tokenDto){
+    public Result<PageData<CaLoudongResultDTO>> getPage(@RequestBody CaLoudongFormDTO dto, @LoginUser TokenDto tokenDto) {
         PageData<CaLoudongResultDTO> data = caLoudongService.getPage(dto);
         return new Result<PageData<CaLoudongResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaPingfangController.java

@@ -24,8 +24,6 @@ import java.util.Map;
 
 
 /**
- * 
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-31
  */
@@ -37,20 +35,20 @@ public class CaPingfangController {
     private CaPingfangService caPingfangService;
 
     @RequestMapping("page")
-    public Result<PageData<CaPingfangDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CaPingfangDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CaPingfangDTO> page = caPingfangService.page(params);
         return new Result<PageData<CaPingfangDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<CaPingfangDTO> get(@PathVariable("id") String id){
+    public Result<CaPingfangDTO> get(@PathVariable("id") String id) {
         CaPingfangDTO data = caPingfangService.get(id);
         return new Result<CaPingfangDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CaPingfangDTO dto){
+    public Result save(@RequestBody CaPingfangDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         caPingfangService.save(dto);
@@ -59,7 +57,7 @@ public class CaPingfangController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody CaPingfangDTO dto){
+    public Result update(@RequestBody CaPingfangDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         caPingfangService.update(dto);
@@ -67,7 +65,7 @@ public class CaPingfangController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         caPingfangService.delete(ids);
@@ -80,8 +78,17 @@ public class CaPingfangController {
         ExcelUtils.exportExcelToTarget(response, null, list, CaPingfangExcel.class);
     }
 
+    /**
+     * 平房基础信息分页
+     *
+     * @param dto
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData>
+     * @author LZN
+     * @date 2022/5/31 18:58
+     */
     @PostMapping("getPage")
-    public Result<PageData> getPage(@RequestBody CaPingfangFormDTO dto, @LoginUser TokenDto tokenDto){
+    public Result<PageData> getPage(@RequestBody CaPingfangFormDTO dto, @LoginUser TokenDto tokenDto) {
         PageData data = caPingfangService.getPage(dto);
         return new Result<PageData>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRentalController.java

@@ -40,20 +40,20 @@ public class CaRentalController {
     private CaRentalService caRentalService;
 
     @RequestMapping("page")
-    public Result<PageData<CaRentalDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CaRentalDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CaRentalDTO> page = caRentalService.page(params);
         return new Result<PageData<CaRentalDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<CaRentalDTO> get(@PathVariable("id") String id){
+    public Result<CaRentalDTO> get(@PathVariable("id") String id) {
         CaRentalDTO data = caRentalService.get(id);
         return new Result<CaRentalDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CaRentalDTO dto){
+    public Result save(@RequestBody CaRentalDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         caRentalService.save(dto);
@@ -62,7 +62,7 @@ public class CaRentalController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody CaRentalDTO dto){
+    public Result update(@RequestBody CaRentalDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         caRentalService.update(dto);
@@ -70,7 +70,7 @@ public class CaRentalController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         caRentalService.delete(ids);
@@ -88,12 +88,12 @@ public class CaRentalController {
      *
      * @param dto
      * @param tokenDto
-     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.CaRentalResultDTO>>
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.CaRentalResultDTO>>
      * @author LZN
      * @date 2022/5/31 18:38
      */
     @PostMapping("getPage")
-    public Result<PageData<CaRentalResultDTO>> getPage(@RequestBody CaRentalFormtDTO dto, @LoginUser TokenDto tokenDto){
+    public Result<PageData<CaRentalResultDTO>> getPage(@RequestBody CaRentalFormtDTO dto, @LoginUser TokenDto tokenDto) {
         PageData<CaRentalResultDTO> data = caRentalService.getPage(dto);
         return new Result<PageData<CaRentalResultDTO>>().ok(data);
     }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaResidentController.java

@@ -1,7 +1,9 @@
 package com.epmet.opendata.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -10,6 +12,10 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.form.CaLoudongFormDTO;
+import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaResidentResultDTO;
 import com.epmet.opendata.excel.CaResidentExcel;
 import com.epmet.opendata.service.CaResidentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,20 +40,20 @@ public class CaResidentController {
     private CaResidentService caResidentService;
 
     @RequestMapping("page")
-    public Result<PageData<CaResidentDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CaResidentDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CaResidentDTO> page = caResidentService.page(params);
         return new Result<PageData<CaResidentDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<CaResidentDTO> get(@PathVariable("id") String id){
+    public Result<CaResidentDTO> get(@PathVariable("id") String id) {
         CaResidentDTO data = caResidentService.get(id);
         return new Result<CaResidentDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CaResidentDTO dto){
+    public Result save(@RequestBody CaResidentDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         caResidentService.save(dto);
@@ -56,7 +62,7 @@ public class CaResidentController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody CaResidentDTO dto){
+    public Result update(@RequestBody CaResidentDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         caResidentService.update(dto);
@@ -64,7 +70,7 @@ public class CaResidentController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         caResidentService.delete(ids);
@@ -77,6 +83,18 @@ public class CaResidentController {
         ExcelUtils.exportExcelToTarget(response, null, list, CaResidentExcel.class);
     }
 
-
+    /**
-
+     * 人口基本信息分页
+     *
+     * @param dto
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.CaResidentResultDTO>>
+     * @author LZN
+     * @date 2022/5/31 18:59
+     */
+    @PostMapping("getPage")
+    public Result<PageData<CaResidentResultDTO>> getPage(@RequestBody CaResidentFormDTO dto, @LoginUser TokenDto tokenDto) {
+        PageData<CaResidentResultDTO> data = caResidentService.getPage(dto);
+        return new Result<PageData<CaResidentResultDTO>>().ok(data);
+    }
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaRotatorsController.java

@@ -1,7 +1,9 @@
 package com.epmet.opendata.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -10,6 +12,10 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.form.CaLoudongFormDTO;
+import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.excel.CaRotatorsExcel;
 import com.epmet.opendata.service.CaRotatorsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,20 +40,20 @@ public class CaRotatorsController {
     private CaRotatorsService caRotatorsService;
 
     @RequestMapping("page")
-    public Result<PageData<CaRotatorsDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<CaRotatorsDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<CaRotatorsDTO> page = caRotatorsService.page(params);
         return new Result<PageData<CaRotatorsDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<CaRotatorsDTO> get(@PathVariable("id") String id){
+    public Result<CaRotatorsDTO> get(@PathVariable("id") String id) {
         CaRotatorsDTO data = caRotatorsService.get(id);
         return new Result<CaRotatorsDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody CaRotatorsDTO dto){
+    public Result save(@RequestBody CaRotatorsDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         caRotatorsService.save(dto);
@@ -56,7 +62,7 @@ public class CaRotatorsController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody CaRotatorsDTO dto){
+    public Result update(@RequestBody CaRotatorsDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         caRotatorsService.update(dto);
@@ -64,7 +70,7 @@ public class CaRotatorsController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         caRotatorsService.delete(ids);
@@ -77,6 +83,20 @@ public class CaRotatorsController {
         ExcelUtils.exportExcelToTarget(response, null, list, CaRotatorsExcel.class);
     }
 
+    /**
+     * 流动人口分页
+     *
+     * @param dto
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.opendata.dto.result.CaRotatorsResultDTO>>
+     * @author LZN
+     * @date 2022/5/31 19:00
+     */
+    @PostMapping("getPage")
+    public Result<PageData<CaRotatorsResultDTO>> getPage(@RequestBody CaRotatorsFormDTO dto, @LoginUser TokenDto tokenDto) {
+        PageData<CaRotatorsResultDTO> data = caRotatorsService.getPage(dto);
+        return new Result<PageData<CaRotatorsResultDTO>>().ok(data);
+    }
 
 
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java

@@ -22,5 +22,13 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
 
     List<CaLoudongDTO> getList();
 
+    /**
+     * 楼栋基本信息分页
+     *
+     * @param communityName
+     * @return java.util.List<com.epmet.opendata.dto.result.CaLoudongResultDTO>
+     * @author LZN
+     * @date 2022/5/31 18:57
+     */
     List<CaLoudongResultDTO> getPage(@Param("communityName") String communityName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java

@@ -9,13 +9,17 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * 
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-31
  */
 @Mapper
 public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
 
+    /**
+     * 平房基础信息分页
+     *
+     * @param buildingName
+     * @return
+     */
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java

@@ -19,5 +19,11 @@ import java.util.List;
 @Mapper
 public interface CaRentalDao extends BaseDao<CaRentalEntity> {
 
+    /**
+     * 出租房信息分页
+     *
+     * @param residentName
+     * @return
+     */
     List<CaRentalResultDTO> getPage(@Param("residentName") String residentName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java

@@ -2,8 +2,12 @@ package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 
+import com.epmet.opendata.dto.result.CaResidentResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 人口基本信息表
@@ -14,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CaResidentDao extends BaseDao<CaResidentEntity> {
 
+    /**
+     * 人口基本信息分页
+     *
+     * @param residentName
+     * @return
+     */
+    List<CaResidentResultDTO> getPage(@Param("residentName") String residentName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java

@@ -2,8 +2,12 @@ package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 
+import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaRotatorsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 流动人口表
@@ -14,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
 
+    /**
+     * 流动人口表
+     *
+     * @param rotatorsName
+     * @return
+     */
+    List<CaRotatorsResultDTO> getPage(@Param("rotatorsName") String rotatorsName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java

@@ -80,6 +80,14 @@ public interface CaLoudongService extends BaseService<CaLoudongEntity> {
      */
     void delete(String[] ids);
 
+    /**
+     * 楼栋基本信息分页
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.page.PageData<com.epmet.opendata.dto.result.CaLoudongResultDTO>
+     * @author LZN
+     * @date 2022/5/31 18:57
+     */
     PageData<CaLoudongResultDTO> getPage(CaLoudongFormDTO dto);
 
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaPingfangService.java

@@ -12,8 +12,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-31
  */
@@ -79,5 +77,11 @@ public interface CaPingfangService extends BaseService<CaPingfangEntity> {
      */
     void delete(String[] ids);
 
+    /**
+     * 平房基础信息分页
+     *
+     * @param dto
+     * @return
+     */
     PageData getPage(CaPingfangFormDTO dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.java

@@ -79,5 +79,11 @@ public interface CaRentalService extends BaseService<CaRentalEntity> {
      */
     void delete(String[] ids);
 
+    /**
+     * 出租房信息分页
+     *
+     * @param dto
+     * @return
+     */
     PageData<CaRentalResultDTO> getPage(CaRentalFormtDTO dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaResidentService.java

@@ -3,6 +3,8 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.result.CaResidentResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 
 
@@ -76,4 +78,12 @@ public interface CaResidentService extends BaseService<CaResidentEntity> {
      * @date 2022-05-31
      */
     void delete(String[] ids);
+
+    /**
+     * 人口基本信息分页
+     *
+     * @param dto
+     * @return
+     */
+    PageData<CaResidentResultDTO> getPage(CaResidentFormDTO dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRotatorsService.java

@@ -3,6 +3,8 @@ package com.epmet.opendata.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
+import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaRotatorsEntity;
 
 import java.util.List;
@@ -75,4 +77,12 @@ public interface CaRotatorsService extends BaseService<CaRotatorsEntity> {
      * @date 2022-05-31
      */
     void delete(String[] ids);
+
+    /**
+     * 流动人口表
+     *
+     * @param dto
+     * @return
+     */
+    PageData<CaRotatorsResultDTO> getPage(CaRotatorsFormDTO dto);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -46,7 +46,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
 
     @Override
     public PageData<CaLoudongDTO> page(Map<String, Object> params) {
-        PageHelper.startPage((int)(params.get("limit")),(int)(params.get("pageSize")));
+        PageHelper.startPage((int) (params.get("limit")), (int) (params.get("pageSize")));
         List<CaLoudongDTO> list = baseDao.getList();
         PageInfo<CaLoudongDTO> info = new PageInfo<>(list);
         return new PageData<>(list, info.getTotal());
@@ -59,8 +59,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
         return ConvertUtils.sourceToTarget(entityList, CaLoudongDTO.class);
     }
 
-    private QueryWrapper<CaLoudongEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<CaLoudongEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CaLoudongEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-05-31
  */
@@ -53,8 +51,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
         return ConvertUtils.sourceToTarget(entityList, CaPingfangDTO.class);
     }
 
-    private QueryWrapper<CaPingfangEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<CaPingfangEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CaPingfangEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -54,8 +54,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         return ConvertUtils.sourceToTarget(entityList, CaRentalDTO.class);
     }
 
-    private QueryWrapper<CaRentalEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<CaRentalEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CaRentalEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -8,9 +8,14 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.opendata.dao.CaResidentDao;
 import com.epmet.opendata.dto.CaResidentDTO;
+import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaResidentResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 import com.epmet.opendata.redis.CaResidentRedis;
 import com.epmet.opendata.service.CaResidentService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -84,4 +89,12 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<CaResidentResultDTO> getPage(CaResidentFormDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        List<CaResidentResultDTO> result = baseDao.getPage(dto.getResidentName());
+        PageInfo<CaResidentResultDTO> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -8,9 +8,14 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.opendata.dao.CaRotatorsDao;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaRotatorsEntity;
 import com.epmet.opendata.redis.CaRotatorsRedis;
 import com.epmet.opendata.service.CaRotatorsService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -84,4 +89,12 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<CaRotatorsResultDTO> getPage(CaRotatorsFormDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        List<CaRotatorsResultDTO> result = baseDao.getPage(dto.getRotatorsName());
+        PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml

@@ -58,6 +58,54 @@
         <result property="attribute9" column="attribute9"/>
         <result property="attribute10" column="attribute10"/>
     </resultMap>
+    <select id="getPage" resultType="com.epmet.opendata.dto.result.CaResidentResultDTO">
+        SELECT
+            resident_id,
+            grid_id,
+            resident_property,
+            resident_type,
+            id_type,
+            id_card,
+            resident_name,
+            sex,
+            birthday,
+            nation,
+            telephone,
+            household_prov,
+            household_city,
+            household_county,
+            household_town,
+            household_village,
+            household_address_detail,
+            curlive_prov,
+            curlive_city,
+            curlive_county,
+            curlive_town,
+            curlive_village,
+            curlive_address_detail,
+            native_address_prov,
+            native_address_city,
+            native_address_county,
+            former_name,
+            education,
+            occupation,
+            occupation_type,
+            service_address,
+            marriage_status,
+            party,
+            religious,
+            conversion_state,
+            nationality,
+            plat_code
+        FROM
+            ca_resident
+            <where>
+                delete_flag = 'normal'
+                <if test="residentName != null and residentName != ''">
+                    AND resident_name = #{residentName}
+                </if>
+            </where>
+    </select>
 
 
 </mapper>

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml

@@ -61,6 +61,55 @@
         <result property="attribute9" column="attribute9"/>
         <result property="attribute10" column="attribute10"/>
     </resultMap>
+    <select id="getPage" resultType="com.epmet.opendata.dto.result.CaRotatorsResultDTO">
+        SELECT
+            rotators_id,
+            id_card,
+            id_type,
+            rotators_name,
+            former_name,
+            sex,
+            birthday,
+            nation,
+            native_address_prov,
+            native_address_city,
+            native_address_country,
+            marriage_status,
+            party,
+            education,
+            religious,
+            occupation_type,
+            occupation,
+            service_address,
+            telephone,
+            household_address_prov,
+            household_address_city,
+            household_address_country,
+            household_address_town,
+            household_address_village,
+            household_address_detail,
+            curlive_address_prov,
+            curlive_address_city,
+            curlive_address_country,
+            curlive_address_town,
+            curlive_address_village,
+            curlive_address_detail,
+            inflow_reason,
+            certificate_type,
+            certificate_number,
+            sign_date,
+            end_date,
+            residence_type,
+            is_focus_person
+        FROM
+            ca_rotators
+            <where>
+                delete_flag = 'normal'
+                <if test="rotatorsName != null and rotatorsName != ''">
+                    AND rotators_name = #{rotatorsName}
+                </if>
+            </where>
+    </select>
 
 
 </mapper>