添加根据idCard查询数据的接口，添加flyway脚本，添加feignClient

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

@@ -0,0 +1,14 @@
+package com.epmet.opendata.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class GetResidentDetailByIdCardFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 2717574179375935921L;
+
+    private String idCard;
+
+}

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

@@ -0,0 +1,187 @@
+package com.epmet.opendata.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ResidentByIdCardResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3809219691923066512L;
+
+    /**
+     * 人口性质
+     */
+    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/feign/GuardarDatosFeignClient.java

@@ -1,7 +1,9 @@
 package com.epmet.opendata.feign;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.feign.impl.GuardarDatosFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,4 +13,7 @@ public interface GuardarDatosFeignClient {
 
     @PostMapping("/opendata/caTask/guardarDatosTask")
     Result guardarDatosTask(PreserVationFormDTO dto);
+
+    @PostMapping("/opendata/caResident/getResidentDetailByIdCard")
+    Result<ResidentByIdCardResultDTO> getResidentDetailByIdCard(GetResidentDetailByIdCardFormDTO form);
 }

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/feign/impl/GuardarDatosFeignClientFallBack.java

@@ -2,7 +2,9 @@ package com.epmet.opendata.feign.impl;
 
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.feign.GuardarDatosFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -14,4 +16,9 @@ public class GuardarDatosFeignClientFallBack implements GuardarDatosFeignClient
         return ModuleUtils.feignConError("open-data-worker", "guardarDatosTask", dto);
     }
 
+    @Override
+    public Result<ResidentByIdCardResultDTO> getResidentDetailByIdCard(GetResidentDetailByIdCardFormDTO form) {
+        return ModuleUtils.feignConError("open-data-worker", "guardarDatosTask", form);
+    }
+
 }

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

@@ -14,9 +14,12 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
+import com.epmet.opendata.entity.CaResidentEntity;
 import com.epmet.opendata.excel.CaResidentExcel;
 import com.epmet.opendata.service.CaResidentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,4 +130,18 @@ public class CaResidentController {
         caResidentService.preserResidentVation(dto);
         return new Result();
     }
+
+    /**
+     * 根据idCard查询resident表数据
+     *
+     * @param form
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/21 17:33
+     */
+    @PostMapping("getResidentDetailByIdCard")
+    public Result<ResidentByIdCardResultDTO> getResidentDetailByIdCard(@RequestBody CaResidentDetailsFormDTO form) {
+        ResidentByIdCardResultDTO dto = caResidentService.getResidentDetailByIdCard(form);
+        return new Result<ResidentByIdCardResultDTO>().ok(dto);
+    }
 }

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

@@ -2,8 +2,11 @@ package com.epmet.opendata.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 
+import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -39,4 +42,6 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
      * @return
      */
     CaResidentDetailsResultDTO getResidentDetails(@Param("idCard") String idCard);
+
+    ResidentByIdCardResultDTO getResidentDetailByIdCard(@Param("form") CaResidentDetailsFormDTO form);
 }

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaResidentEntity.java

@@ -21,16 +21,6 @@ public class CaResidentEntity {
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 人口ID
-     */
-	private Long residentId;
-
-	/**
-	 * homeId
-	 */
-	private String homeId;
-
 	/**
 	 * 对应的ic_resi_user主表Id
 	 */

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

@@ -5,12 +5,13 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -104,4 +105,14 @@ public interface CaResidentService extends BaseService<CaResidentEntity> {
      * @return
      */
     CaResidentDetailsResultDTO getResidentDetails(CaResidentDetailsFormDTO dto);
-}
+
+    /**
+     * 根据idCard查询resident表数据
+     *
+     * @param form
+     * @return com.epmet.opendata.dto.result.ResidentByIdCardResultDTO
+     * @author LZN
+     * @date 2022/6/21 17:33
+     */
+    ResidentByIdCardResultDTO getResidentDetailByIdCard(CaResidentDetailsFormDTO form);
+}

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
@@ -17,9 +19,11 @@ import com.epmet.opendata.dto.ca.CaResidentDTO;
 import com.epmet.opendata.dto.constant.CaWghDataConstant;
 import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
 import com.epmet.opendata.dto.form.CaResidentFormDTO;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
 import com.epmet.opendata.dto.form.PreserVationFormDTO;
 import com.epmet.opendata.dto.result.CaResidentDetailsResultDTO;
 import com.epmet.opendata.dto.result.CaResidentResultDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
 import com.epmet.opendata.entity.CaResidentEntity;
 import com.epmet.opendata.redis.CaResidentRedis;
 import com.epmet.opendata.service.CaResidentService;
@@ -155,6 +159,20 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
         return result;
     }
 
+    /**
+     * 根据idCard查询resident表数据
+     *
+     * @param form
+     * @return com.epmet.opendata.dto.result.ResidentByIdCardResultDTO
+     * @author LZN
+     * @date 2022/6/21 17:33
+     */
+    @Override
+    public ResidentByIdCardResultDTO getResidentDetailByIdCard(CaResidentDetailsFormDTO form) {
+        ResidentByIdCardResultDTO dto = baseDao.getResidentDetailByIdCard(form);
+        return dto;
+    }
+
 
     private int listResident(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.7__drop_home_id_and_ic_resi_user.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_open_data`.`ca_resident`
+DROP COLUMN `home_id`,
+DROP COLUMN `ic_resi_user`;

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

@@ -136,6 +136,52 @@
                 </if>
             </where>
     </select>
+    <select id="getResidentDetailByIdCard"
+            resultType="com.epmet.opendata.dto.result.ResidentByIdCardResultDTO">
+        SELECT
+            resident_property,
+            resident_type,
+            id_type,
+            ID_CARD,
+            resident_name,
+            sex,
+            BIRTHDAY,
+            nation,
+            telephone,
+            household_prov,
+            household_city,
+            household_county,
+            household_town,
+            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="form.idCard != null and form.idCard != ''">
+                AND id_card = #{form.idCard}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>