出租房信息分页接口

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

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

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

@@ -0,0 +1,128 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class CaRentalResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1721373620271590333L;
+
+    /**
+     * 出租房ID
+     */
+    private Long rentalId;
+
+    /**
+     * 网格ID
+     */
+    private Long gridId;
+
+    /**
+     * 房屋ID
+     */
+    private Long houseId;
+
+    /**
+     * 房屋编号
+     */
+    private String houseName;
+
+    /**
+     * 房屋地址
+     */
+    private String houseAddress;
+
+    /**
+     * 建筑用途
+     */
+    private String houseUse;
+
+    /**
+     * 建筑面积（平方米）
+     */
+    private BigDecimal houseArea;
+
+    /**
+     * 证件代码
+     */
+    private String idType;
+
+    /**
+     * 证件号码
+     */
+    private String idCard;
+
+    /**
+     * 房主姓名
+     */
+    private String residentName;
+
+    /**
+     * 房主联系方式
+     */
+    private String telephone;
+
+    /**
+     * 房主现居详址
+     */
+    private String curliveAddress;
+
+    /**
+     * 出租用途
+     */
+    private String rentUse;
+
+    /**
+     * 隐患类型
+     */
+    private String troubleType;
+
+    /**
+     * 承租人ID
+     */
+    private Long renterId;
+
+    /**
+     * 承租人公民身份证号码
+     */
+    private String renterCardNumber;
+
+    /**
+     * 承租人证件类型
+     */
+    private Long renterCardType;
+
+    /**
+     * 承租人姓名
+     */
+    private String renterName;
+
+    /**
+     * 承租人联系方式
+     */
+    private String renterPhone;
+
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 标绘状态
+     */
+    private String pointStatus;
+
+    /**
+     * 数据来源
+     */
+    private String platCode;
+
+}

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

@@ -83,7 +83,7 @@ public class CaLoudongController {
 
     @PostMapping("getPage")
     public Result<PageData<CaLoudongResultDTO>> getPage(@RequestBody CaLoudongFormDTO dto, @LoginUser TokenDto tokenDto){
-        PageData data = caLoudongService.getPage(dto);
+        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/CaRentalController.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.CaRentalDTO;
+import com.epmet.opendata.dto.form.CaLoudongFormDTO;
+import com.epmet.opendata.dto.form.CaRentalFormtDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRentalResultDTO;
 import com.epmet.opendata.excel.CaRentalExcel;
 import com.epmet.opendata.service.CaRentalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +83,19 @@ public class CaRentalController {
         ExcelUtils.exportExcelToTarget(response, null, list, CaRentalExcel.class);
     }
 
-
+    /**
+     * 出租房信息分页
+     *
+     * @param dto
+     * @param tokenDto
+     * @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){
+        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/dao/CaRentalDao.java

@@ -2,8 +2,13 @@ package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRentalResultDTO;
 import com.epmet.opendata.entity.CaRentalEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 出租房信息表
@@ -13,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CaRentalDao extends BaseDao<CaRentalEntity> {
-	
+
+    List<CaRentalResultDTO> getPage(@Param("residentName") String residentName);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaRentalService.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.CaRentalDTO;
+import com.epmet.opendata.dto.form.CaRentalFormtDTO;
+import com.epmet.opendata.dto.result.CaRentalResultDTO;
 import com.epmet.opendata.entity.CaRentalEntity;
 
 
@@ -76,4 +78,6 @@ public interface CaRentalService extends BaseService<CaRentalEntity> {
      * @date 2022-05-31
      */
     void delete(String[] ids);
+
+    PageData<CaRentalResultDTO> getPage(CaRentalFormtDTO dto);
 }

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

@@ -9,9 +9,14 @@ import com.epmet.commons.tools.constant.FieldConstant;
 
 import com.epmet.opendata.dao.CaRentalDao;
 import com.epmet.opendata.dto.CaRentalDTO;
+import com.epmet.opendata.dto.form.CaRentalFormtDTO;
+import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRentalResultDTO;
 import com.epmet.opendata.entity.CaRentalEntity;
 import com.epmet.opendata.redis.CaRentalRedis;
 import com.epmet.opendata.service.CaRentalService;
+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;
@@ -85,4 +90,12 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PageData<CaRentalResultDTO> getPage(CaRentalFormtDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        List<CaRentalResultDTO> result = baseDao.getPage(dto.getResidentName());
+        PageInfo<CaRentalResultDTO> info = new PageInfo<>(result);
+        return new PageData<>(result, info.getTotal());
+    }
+
 }

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

@@ -44,6 +44,40 @@
         <result property="attribute9" column="attribute9"/>
         <result property="attribute10" column="attribute10"/>
     </resultMap>
+    <select id="getPage" resultType="com.epmet.opendata.dto.result.CaRentalResultDTO">
+        SELECT
+            rental_id,
+            grid_id,
+            house_id,
+            house_name,
+            house_address,
+            house_use,
+            house_area,
+            id_type,
+            id_card,
+            resident_name,
+            telephone,
+            curlive_address,
+            rent_use,
+            trouble_type,
+            renter_id,
+            renter_card_number,
+            renter_card_type,
+            renter_name,
+            renter_phone,
+            longitude,
+            latitude,
+            point_status,
+            plat_code
+        FROM
+            ca_rental
+        <where>
+            delete_flag = 'normal'
+            <if test="residentName != null and residentName != ''">
+                AND resident_name = #{residentName}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>