From ab5a16ea9ef66b02ba4c8634e8793323dd15df5d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 8 Sep 2021 16:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=94=B9?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/config/FeignRequestInterceptor.java | 38 ++++++ .../epdc/config/FeignRequestInterceptor.java | 38 ++++++ .../epidemic/dao/EpidemicUserInfoDao.java | 9 ++ .../entity/EpidemicUserInfoEntity.java | 126 +++++++++++++++++- .../service/EpidemicUserInfoService.java | 1 - .../house/dao/PopulationInformationDao.java | 9 ++ .../impl/HousingInformationServiceImpl.java | 104 ++++++++++++--- .../PopulationInformationServiceImpl.java | 80 ++++++++++- .../mapper/epidemic/EpidemicUserInfoDao.xml | 36 ++--- .../mapper/house/HouseResidentDao.xml | 31 ++--- .../mapper/house/PopulationInformationDao.xml | 38 ++++++ 11 files changed, 452 insertions(+), 58 deletions(-) create mode 100644 epdc-cloud-custom/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java new file mode 100644 index 0000000..0362d76 --- /dev/null +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.config; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; + +/** + * + * feign转发header参数 + * + * @Author：liuchuang + * @Date：2019/11/26 16:29 + */ +@Configuration +public class FeignRequestInterceptor implements RequestInterceptor { + + @Override + public void apply(RequestTemplate template) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder + .getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + Enumeration headerNames = request.getHeaderNames(); + if (headerNames != null) { + while (headerNames.hasMoreElements()) { + String name = headerNames.nextElement(); + String values = request.getHeader(name); + template.header(name, values); + } + } + template.header("Content-Type","application/json"); + template.header("content-type","application/json"); + } +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java new file mode 100644 index 0000000..0362d76 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/config/FeignRequestInterceptor.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.config; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Enumeration; + +/** + * + * feign转发header参数 + * + * @Author：liuchuang + * @Date：2019/11/26 16:29 + */ +@Configuration +public class FeignRequestInterceptor implements RequestInterceptor { + + @Override + public void apply(RequestTemplate template) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder + .getRequestAttributes(); + HttpServletRequest request = attributes.getRequest(); + Enumeration headerNames = request.getHeaderNames(); + if (headerNames != null) { + while (headerNames.hasMoreElements()) { + String name = headerNames.nextElement(); + String values = request.getHeader(name); + template.header(name, values); + } + } + template.header("Content-Type","application/json"); + template.header("content-type","application/json"); + } +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java index 5458f60..d85050b 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java @@ -166,4 +166,13 @@ public interface EpidemicUserInfoDao extends BaseDao { */ void updateUserAge(); + /** + * @return void + * @Description 清空入党时间 + * @Author zhangyuan + * @Date 2020/9/4 + * @Param [id] + **/ + void setJionTimeToNull(@Param("id") String id); + } \ No newline at end of file diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java index 73eb477..82e4d92 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/entity/EpidemicUserInfoEntity.java @@ -17,20 +17,24 @@ import java.util.Date; @EqualsAndHashCode(callSuper=false) @TableName("epidemic_user_info") public class EpidemicUserInfoEntity extends BasePingyinEntity { + private static final long serialVersionUID = 1L; /** * 姓名 */ private String userName; + /** * 身份证号 */ private String idCard; + /** * 户籍地code */ private String householdRegisterCode; + /** * 户籍地名称 */ @@ -45,98 +49,122 @@ public class EpidemicUserInfoEntity extends BasePingyinEntity { * 性别 */ private String gender; + /** * 民族 */ private String nation; + /** * 曾用名 */ private String formerName; + /** * 出生年月 */ private String birthday; + /** * 身高 */ private String height; + /** * 文化程度 */ private String standardOfCulture; + /** * 健康情况 */ private String health; + /** * 婚姻状况 */ private String maritalStatus; + /** * 与户主关系 */ private String relation; + /** * 国籍 */ private String nationality; + /** * 政治面貌 */ private String politicsStatus; + /** * 宗教信仰 */ private String faith; + /** * 毕业院校 */ private String graduateSchool; + /** * 专业 */ private String professional; + /** * 工作状态 */ private String workStatus; + /** * 行业类别 */ private String industryCategory; + /** * 工作单位（现/原） */ private String workUnits; + /** * 兵役状况 */ private String military; + /** * 人口类别 */ private String peopleCategories; + /** * 特殊人群 */ private String specialCrowd; + /** * 有无车辆 */ private String car; + /** * 车牌号 */ private String carNo; + /** * 人户状况 */ private String hushaiStatus; + /** * 籍贯 */ private String nativePlace; + /** * 血型 */ @@ -158,24 +186,118 @@ public class EpidemicUserInfoEntity extends BasePingyinEntity { private Integer age; /** - * 县内居住地名称 + * 县内居住地镇街 */ private String liveAddressName; + /** * 社区/村庄 */ private String community; + /** * 网格名称 + */ private String gridName; /** - * 核酸检测状态 + * 核酸检测状态：0已检测 1未检测 */ private String checkState; + /** * 核酸检测时间 */ private Date checkDate; + + /** + * 入党时间 + */ + private String joinTime; + + /** + * 组织关系所在地 + */ + private String organizationalRelationshipLocation; + + /** + * 手机号或座机号 + */ + private String mobile; + + /** + * 户口类型 (0：城镇 1：农业) + */ + private String accountType; + + /** + * 现单位地址 + */ + private String currentEmployerAddress; + + /** + * 失业原因 (0：原单位破产 1：解除合同 2：效益不好 3：减员 4：其他) + */ + private String unemploymentReason; + + /** + * 再就业优惠证 (0：无 1：有) + */ + private String reemploymentPermit; + + /** + * 失业登记 (0：否 1：是) + */ + private String unemploymentRegister; + + /** + * 失业登记时间 + */ + private String unemploymentRegisterTime; + + /** + * 家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭) + */ + private String familyCategory; + + /** + * 救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他) + */ + private String helpStatus; + + /** + * 机动车数量 + */ + private Integer motorVehicleNum; + + /** + * 机动车类型 (0：轿车 1：摩托 2：其他) + */ + private String motorVehicleCategory; + + /** + * 宠物犬状况 (0：无 1：有) + */ + private String dogStatus; + + /** + * 家庭成员数 + */ + private Integer familyMemberNum; + + /** + * 家庭外出成员数 + */ + private Integer familyMemberOutNum; + + /** + * 外出原因 (0：务工 1：上学 2：探亲 3：其他) + */ + private String familyMemberOutReason; + + /** + * 在外月数 + */ + private Integer familyMemberOutMonth; } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java index dce5649..30ecfb9 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java @@ -14,7 +14,6 @@ import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultV2DTO; import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; -import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoV2DTO; import java.util.List; import java.util.Map; diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/dao/PopulationInformationDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/dao/PopulationInformationDao.java index 73fff0f..cc6d904 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/dao/PopulationInformationDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/dao/PopulationInformationDao.java @@ -66,6 +66,15 @@ public interface PopulationInformationDao extends BaseDao * @Description 人口信息列表 diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java index 14d7075..c9aa2e6 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.*; @@ -32,9 +33,15 @@ import com.elink.esua.epdc.constant.PopulationDictConstant; import com.elink.esua.epdc.dto.OrganizationModifyDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; -import com.elink.esua.epdc.dto.house.*; +import com.elink.esua.epdc.dto.house.BasePopulationInformationExportDto; +import com.elink.esua.epdc.dto.house.BaseResidentInformationExportDto; +import com.elink.esua.epdc.dto.house.HousingInformationDTO; +import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO; import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; +import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; +import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient; import com.elink.esua.epdc.vaccine.house.dao.HouseResidentDao; import com.elink.esua.epdc.vaccine.house.dao.HousingInformationDao; @@ -42,7 +49,10 @@ import com.elink.esua.epdc.vaccine.house.entity.*; import com.elink.esua.epdc.vaccine.house.excel.BasePopulationInformationExcel; import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationExcel; import com.elink.esua.epdc.vaccine.house.redis.HousingInformationRedis; -import com.elink.esua.epdc.vaccine.house.service.*; +import com.elink.esua.epdc.vaccine.house.service.HouseBusinessInfoService; +import com.elink.esua.epdc.vaccine.house.service.HouseRentInfoService; +import com.elink.esua.epdc.vaccine.house.service.HousingInformationService; +import com.elink.esua.epdc.vaccine.house.service.PopulationInformationService; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; @@ -50,6 +60,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.io.File; import java.math.BigDecimal; import java.util.*; @@ -75,7 +86,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl page(Map params) { @@ -172,7 +189,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl parentAndAllDept = adminFeignClient.getParentAndAllDept(String.valueOf(entity.getGridId())); + Result parentAndAllDept = adminVimFeignClient.getParentAndAllDept(String.valueOf(entity.getGridId())); if (parentAndAllDept == null || !parentAndAllDept.success()) { throw new RenException("获取部门信息失败"); } @@ -301,7 +318,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl parentAndAllDept = adminFeignClient.getParentAndAllDept(gridId); + Result parentAndAllDept = adminVimFeignClient.getParentAndAllDept(gridId); if (!parentAndAllDept.success() || parentAndAllDept.getData() == null) { return new Result().error("获取归属部门信息失败"); } @@ -313,7 +330,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl> listResult = adminFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO); + Result> listResult = adminVimFeignClient.listPopulationSimple(sysPopulationSimpleDictFormDTO); if (listResult == null || !listResult.success()) { return new Result().error("获取字典信息失败"); } @@ -451,19 +468,20 @@ public class HousingInformationServiceImpl extends BaseServiceImpl 128) { errorLineInfoDto = new EpdcPopulationErrorResultDTO(); @@ -1316,5 +1335,56 @@ public class HousingInformationServiceImpl extends BaseServiceImpl page(Map params) { @@ -161,8 +171,8 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl - + + update epidemic_user_info + set JOIN_TIME = null + where ID = #{id} + diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml index e1bb98d..76de65f 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HouseResidentDao.xml @@ -18,21 +18,22 @@ diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/PopulationInformationDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/PopulationInformationDao.xml index d32814b..9355dd0 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/PopulationInformationDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/PopulationInformationDao.xml @@ -98,6 +98,44 @@ and t1.IS_HOUSE_HEAD = '1' and t1.HOUSE_ID = #{houseId} limit 1 +