流动人口详情

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

@@ -0,0 +1,16 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CaRotatorsDetailsFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -536489426327498665L;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+}

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

@@ -10,8 +10,21 @@ public class CaRotatorsFormDTO implements Serializable {
 
     private static final long serialVersionUID = 3356808153818385932L;
 
+    /**
+     * 姓名
+     */
     private String rotatorsName;
 
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 联系方式
+     */
+    private String telephone;
+
     private Integer page;
     private Integer limit;
 }

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

@@ -0,0 +1,213 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CaRotatorsDetailsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 6450956000162367591L;
+
+    /**
+     * 主键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;
+
+    /**
+     * 数据来源编码
+     */
+    private String platcode;
+
+    /**
+     * 网格id
+     */
+    private Long gridId;
+
+}

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

@@ -13,9 +13,11 @@ 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.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.excel.CaRotatorsExcel;
 import com.epmet.opendata.service.CaRotatorsService;
@@ -99,6 +101,21 @@ public class CaRotatorsController {
         return new Result<PageData<CaRotatorsResultDTO>>().ok(data);
     }
 
+    /**
+     * 流动人口详情
+     *
+     * @param dto
+     * @param tokenDto
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO>
+     * @author LZN
+     * @date 2022/6/2 15:33
+     */
+    @PostMapping("getRotatorsDetails")
+    public Result<CaRotatorsDetailsResultDTO> getRotatorsDetails(@RequestBody CaRotatorsDetailsFormDTO dto, @LoginUser TokenDto tokenDto) {
+        CaRotatorsDetailsResultDTO result = caRotatorsService.getRotatorsDetails(dto);
+        return new Result<CaRotatorsDetailsResultDTO>().ok(result);
+    }
+
     /**
      * 流动人口调用ruoyi接口存储数据
      *

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

@@ -2,8 +2,10 @@ package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 
+import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaRotatorsEntity;
+import com.sun.tracing.dtrace.ProviderAttributes;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +26,17 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
      * @param rotatorsName
      * @return
      */
-    List<CaRotatorsResultDTO> getPage(@Param("rotatorsName") String rotatorsName);
+    List<CaRotatorsResultDTO> getPage(@Param("rotatorsName") String rotatorsName,
+                                      @Param("idCard") String idCard,
+                                      @Param("telephone") String telephone);
 
     void deleteAll();
+
+    /**
+     * 流动人口详情
+     *
+     * @param idCard
+     * @return
+     */
+    CaRotatorsDetailsResultDTO getRotatorsDetails(@Param("idCard") String idCard);
 }

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

@@ -3,8 +3,10 @@ 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.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaRotatorsEntity;
 
@@ -93,4 +95,12 @@ public interface CaRotatorsService extends BaseService<CaRotatorsEntity> {
      * @param dto
      */
     void preserRotatorsVation(PreserVationFormDTO dto);
+
+    /**
+     * 流动人口详情
+     *
+     * @param dto
+     * @return
+     */
+    CaRotatorsDetailsResultDTO getRotatorsDetails(CaRotatorsDetailsFormDTO dto);
 }

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

@@ -15,9 +15,11 @@ import com.epmet.dto.IcResiUserDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.opendata.dao.CaRotatorsDao;
 import com.epmet.opendata.dto.CaRotatorsDTO;
+import com.epmet.opendata.dto.form.CaRotatorsDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaRotatorsFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaLoudongResultDTO;
+import com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaRotatorsResultDTO;
 import com.epmet.opendata.entity.CaLoudongEntity;
 import com.epmet.opendata.entity.CaRotatorsEntity;
@@ -104,7 +106,9 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
     @Override
     public PageData<CaRotatorsResultDTO> getPage(CaRotatorsFormDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getLimit());
-        List<CaRotatorsResultDTO> result = baseDao.getPage(dto.getRotatorsName());
+        List<CaRotatorsResultDTO> result = baseDao.getPage(dto.getRotatorsName(),
+                dto.getIdCard(),
+                dto.getTelephone());
         PageInfo<CaRotatorsResultDTO> info = new PageInfo<>(result);
         return new PageData<>(result, info.getTotal());
     }
@@ -139,6 +143,12 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
         } while (total > (pageNo * NumConstant.FIFTY));
     }
 
+    @Override
+    public CaRotatorsDetailsResultDTO getRotatorsDetails(CaRotatorsDetailsFormDTO dto) {
+        CaRotatorsDetailsResultDTO result = baseDao.getRotatorsDetails(dto.getIdCard());
+        return result;
+    }
+
     enum rotatorsEnum {
 
         LDRK("unicom", "ca_rotators"),

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

@@ -111,6 +111,24 @@
                 <if test="rotatorsName != null and rotatorsName != ''">
                     AND rotators_name = #{rotatorsName}
                 </if>
+                <if test="idCard != null and idCard != ''">
+                    AND id_card = #{idCard}
+                </if>
+                <if test="telephone != null and telephone != ''">
+                    AND telephone = #{telephone}
+                </if>
+            </where>
+    </select>
+    <select id="getRotatorsDetails" resultType="com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO">
+        select
+            *
+        from
+            ca_rotators
+            <where>
+                delete_flag = 'normal'
+                <if test="idCard != null and idCard != ''">
+                    AND id_card = #{idCard}
+                </if>
             </where>
     </select>