Browse Source

新增:事件研判分析+同类事件列表分页查询

dev
wangxianzhang 3 years ago
parent
commit
f374fe3a7b
  1. 7
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
  2. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
  3. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java
  4. 6
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java
  5. 28
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
  6. 16
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java
  7. 1
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java
  8. 71
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java
  9. 32
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
  10. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
  11. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java
  12. 21
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
  13. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java
  14. 102
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
  15. 25
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
  16. 16
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  17. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
  18. 23
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  19. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  20. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

7
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@ -385,4 +385,11 @@ public interface GovIssueOpenFeignClient {
*/
@PostMapping("/gov/issue/issue/audit-reset")
Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId);
/**
* 根据categoryId查询分类信息
* @return
*/
@PostMapping("/gov/issue/issueprojectcategorydict/getByCategoryCode/{category-code}")
Result<IssueProjectCategoryDictDTO> getByCategoryCode(@PathVariable("category-code") String categoryCode);
}

5
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@ -321,4 +321,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient
public Result<Boolean> issueAuditReset(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId);
}
@Override
public Result<IssueProjectCategoryDictDTO> getByCategoryCode(String categoryCode) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getByCategoryCode", categoryCode);
}
}

10
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java

@ -299,5 +299,15 @@ public class IssueProjectCategoryDictController {
return new Result<Map<String, String>>().ok(issueProjectCategoryDictService.getCategoryMap(customerId));
}
/**
* 根据categoryId查询分类信息
* @return
*/
@PostMapping("getByCategoryCode/{category-code}")
public Result<IssueProjectCategoryDictDTO> getByCategoryCode(@PathVariable("category-code") String categoryCode) {
IssueProjectCategoryDictDTO r = issueProjectCategoryDictService.getByCategoryCode(categoryCode);
return new Result<IssueProjectCategoryDictDTO>().ok(r);
}
}

6
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueProjectCategoryDictService.java

@ -231,4 +231,10 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
Map<String, String> getCategoryMap(String customerId);
/**
* 根据分类code查询分类信息
* @param categoryCode
* @return
*/
IssueProjectCategoryDictDTO getByCategoryCode(String categoryCode);
}

28
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@ -17,9 +17,11 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.constant.AppClientConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
@ -27,6 +29,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.EpmetRequestHolder;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.IssueCategoryDao;
import com.epmet.dao.IssueProjectCategoryDictDao;
@ -540,4 +543,29 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
}
return r.toString().substring(NumConstant.ZERO,r.length()-NumConstant.ONE);
}
@Override
public IssueProjectCategoryDictDTO getByCategoryCode(String categoryCode) {
String customerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID);
LambdaQueryWrapper<IssueProjectCategoryDictEntity> query = new LambdaQueryWrapper<>();
query.eq(IssueProjectCategoryDictEntity::getCategoryCode, categoryCode);
query.eq(IssueProjectCategoryDictEntity::getCustomerId, customerId);
IssueProjectCategoryDictEntity entity = baseDao.selectOne(query);
if (entity == null) {
return null;
}
IssueProjectCategoryDictDTO r = ConvertUtils.sourceToTarget(entity, IssueProjectCategoryDictDTO.class);
LambdaQueryWrapper<IssueProjectCategoryDictEntity> pquery = new LambdaQueryWrapper<>();
pquery.eq(IssueProjectCategoryDictEntity::getId, r.getPid());
pquery.eq(IssueProjectCategoryDictEntity::getCustomerId, customerId);
IssueProjectCategoryDictEntity pgEntity = baseDao.selectOne(pquery);
if (pgEntity != null) {
r.setParentCategoryName(pgEntity.getCategoryName());
}
return r;
}
}

16
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/EventProcessAnalysisCommonFormDTO.java

@ -24,16 +24,21 @@ public class EventProcessAnalysisCommonFormDTO {
*/
public interface MonthlyIncrementAnalysis {}
/**
* 同类事件列表
*/
public interface SameCategoryEvents {}
/**
* 要查询的组织ID
*/
@NotBlank(message = "组织ID为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class })
@NotBlank(message = "组织ID为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class, SameCategoryEvents.class })
private String orgId;
/**
* 组织类型grid,agency
*/
@NotBlank(message = "组织类型为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class })
@NotBlank(message = "组织类型为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class, SameCategoryEvents.class })
private String orgType;
/**
@ -52,4 +57,11 @@ public class EventProcessAnalysisCommonFormDTO {
@NotNull(message = "查询时间为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class })
private Date queryEndTime;
@NotBlank(message = "分类Id不能为空", groups = { SameCategoryEvents.class })
private String categoryPids;
private Integer pageNo = 1;
private Integer pageSize = 20;
}

1
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventResultDTO.java

@ -15,4 +15,5 @@ public class IcEventResultDTO {
private String reportUserId;
private String reportUserName;
private String mobile;
private String address;
}

71
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventYpAnalysisResultDTO.java

@ -0,0 +1,71 @@
package com.epmet.dto.result;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 研判分析
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class IcEventYpAnalysisResultDTO {
/**
* 家属
*/
private List<Dependent> dependents;
/**
* 上报人居民端小程序id
*/
//private String reportorUserId;
/**
* 上报人居民信息id
*/
private String reportorResiId;
/**
* 上报人姓名
*/
private String reportorName;
/**
* 上报人手机号
*/
private String reportorMobile;
/**
* 上报人身份证号
*/
private String reportorIdCard;
/**
* 上报渠道名称
*/
private String sourceTypeName;
/**
* 事件分类名称(目前是一级)
*/
private String categoryName;
/**
* 事件分类编码(目前是一级)
*/
private String categoryCode;
/**
* 事件分类ID path
*/
private String categoryPids;
/**
* 家属
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class Dependent {
private String id;
private String name;
}
}

32
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@ -17,10 +17,7 @@ import com.epmet.dto.form.EventProcessAnalysisCommonFormDTO;
import com.epmet.dto.form.IcEventAddEditFormDTO;
import com.epmet.dto.form.IcEventListFormDTO;
import com.epmet.dto.form.ProcessAnalysisEventListFormDTO;
import com.epmet.dto.result.IcEventListResultDTO;
import com.epmet.dto.result.IcEventMonthlyIncrementResultDTO;
import com.epmet.dto.result.IcEventResultDTO;
import com.epmet.dto.result.ProcessStatusRatioResultDTO;
import com.epmet.dto.result.*;
import com.epmet.service.IcEventService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -143,6 +140,33 @@ public class IcEventController {
return new Result<List<IcEventMonthlyIncrementResultDTO>>().ok(page);
}
/**
* 研判分析查询
* @param eventId
* @return
*/
@PostMapping("processAnalysis/analysis/{event-id}")
public Result<IcEventYpAnalysisResultDTO> getYpAnalysis(@PathVariable("event-id") String eventId) {
IcEventYpAnalysisResultDTO r = icEventService.getYpAnalysis(eventId);
return new Result<IcEventYpAnalysisResultDTO>().ok(r);
}
/**
* 组织下分类下的事件列表
* @param input
* @return
*/
@PostMapping("processAnalysis/categoryEventList")
public Result<PageData<IcEventResultDTO>> getSameCategoryEvents(@RequestBody EventProcessAnalysisCommonFormDTO input) {
ValidatorUtils.validateEntity(input, EventProcessAnalysisCommonFormDTO.SameCategoryEvents.class);
String categroyPid = input.getCategoryPids();
String orgId = input.getOrgId();
String orgType = input.getOrgType();
Integer pageNo = input.getPageNo();
Integer pageSize = input.getPageSize();
PageData<IcEventResultDTO> page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize);
return new Result<PageData<IcEventResultDTO>>().ok(page);
}

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java

@ -78,4 +78,16 @@ public interface IcEventDao extends BaseDao<IcEventEntity> {
@Param("gridPids") String gridPids,
@Param("queryStartTime") Date queryStartTime,
@Param("queryEndTime") Date queryEndTime);
/**
* 按父级分类查询组织下的事件列表
* @param orgId
* @param orgType
* @param categoryPids
* @return
*/
List<IcEventResultDTO> listEventsByPCategoryInOrg(@Param("orgId") String orgId,
@Param("gridPids") String gridPids,
@Param("orgType") String orgType,
@Param("categoryPids") String categoryPids);
}

7
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventCategoryService.java

@ -75,4 +75,11 @@ public interface IcEventCategoryService extends BaseService<IcEventCategoryEntit
* @date 2022-05-17
*/
void delete(String[] ids);
/**
* 根据事件id查询事件对应的分类
* @param eventId
* @return
*/
IcEventCategoryEntity getByEventId(String eventId);
}

21
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@ -5,10 +5,7 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IcEventDTO;
import com.epmet.dto.form.IcEventAddEditFormDTO;
import com.epmet.dto.form.IcEventListFormDTO;
import com.epmet.dto.result.IcEventListResultDTO;
import com.epmet.dto.result.IcEventMonthlyIncrementResultDTO;
import com.epmet.dto.result.IcEventResultDTO;
import com.epmet.dto.result.ProcessStatusRatioResultDTO;
import com.epmet.dto.result.*;
import com.epmet.entity.IcEventEntity;
import java.util.Date;
@ -99,4 +96,20 @@ public interface IcEventService extends BaseService<IcEventEntity> {
* @return
*/
List<IcEventMonthlyIncrementResultDTO> listMonthlyIncrement(String orgType, String orgId, Date queryStartTime, Date queryEndTime);
/**
* 研判分析查询
* @param eventId
* @return
*/
IcEventYpAnalysisResultDTO getYpAnalysis(String eventId);
/**
* 同类事件列表
* @param categoryPids
* @param pageNo
* @param pageSize
* @return
*/
PageData<IcEventResultDTO> getSameCategoryEvents(String orgId, String orgType, String categoryPids, Integer pageNo, Integer pageSize);
}

7
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventCategoryServiceImpl.java

@ -1,5 +1,6 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@ -80,4 +81,10 @@ public class IcEventCategoryServiceImpl extends BaseServiceImpl<IcEventCategoryD
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public IcEventCategoryEntity getByEventId(String eventId) {
LambdaQueryWrapper<IcEventCategoryEntity> query = new LambdaQueryWrapper<>();
query.eq(IcEventCategoryEntity::getIcEventId, eventId);
return baseDao.selectOne(query);
}
}

102
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@ -1,5 +1,6 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.AppClientConstant;
@ -29,15 +30,14 @@ import com.epmet.commons.tools.utils.ScanContentUtils;
import com.epmet.dao.IcEventDao;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.IcEventDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.IssueProjectCategoryDictDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.form.demand.DemandRecId;
import com.epmet.dto.result.*;
import com.epmet.entity.*;
import com.epmet.enums.EcEventProcessStatusEnum;
import com.epmet.feign.EpmetAdminOpenFeignClient;
import com.epmet.feign.EpmetHeartOpenFeignClient;
import com.epmet.feign.GovIssueOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.feign.*;
import com.epmet.resi.group.constant.TopicConstant;
import com.epmet.service.*;
import com.github.pagehelper.PageHelper;
@ -88,7 +88,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
private IcEventReplyService icEventReplyService;
@Autowired
private IcEventOperationLogService icEventOperationLogService;
@Autowired
private EpmetUserOpenFeignClient userOpenFeignClient;
@Override
public PageData<IcEventListResultDTO> list(IcEventListFormDTO formDTO) {
@ -511,4 +512,95 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
return resultList;
}
@Override
public IcEventYpAnalysisResultDTO getYpAnalysis(String eventId) {
// 事件上报渠道字典
Map<String, String> sourceTypeMap = getResultDataOrThrowsException(
adminOpenFeignClient.dictMap("ic_event_source_type"),
ServiceConstant.EPMET_ADMIN_SERVER,
EpmetErrorCode.SERVER_ERROR.getCode(),
"【事件研判分析】查询事件上报渠道字典失败",
"【事件研判分析】查询事件上报渠道字典失败");
// 事件信息
IcEventEntity event = baseDao.selectById(eventId);
if (event == null) {
return null;
}
// 事件分类
IcEventCategoryEntity eventCategory = icEventCategoryService.getByEventId(eventId);
// 分类字典
IssueProjectCategoryDictDTO categoryDictItem = getResultDataOrThrowsException(govIssueOpenFeignClient.getByCategoryCode(eventCategory.getCategoryCode()),
ServiceConstant.GOV_ISSUE_SERVER,
EpmetErrorCode.SERVER_ERROR.getCode(),
"【事件研判分析】查询分类字典失败",
"【事件研判分析】查询分类字典失败");
// 上报人信息
String idCard = event.getIdCard();
String icResiId = null;
List<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
if (StringUtils.isNotBlank(idCard)) {
IcResiUserDTO resiInfo = getResultDataOrThrowsException(userOpenFeignClient.getByResiIdCard(idCard),
ServiceConstant.EPMET_USER_SERVER,
EpmetErrorCode.SERVER_ERROR.getCode(),
"【事件研判分析】根据身份证号查找居民信息失败",
"【事件研判分析】根据身份证号查找居民信息失败");
if (resiInfo != null) {
icResiId = resiInfo.getId();
}
dependents = getDependents(event.getIdCard());
}
IcEventYpAnalysisResultDTO r = new IcEventYpAnalysisResultDTO();
r.setReportorResiId(icResiId);
r.setReportorName(event.getName());
r.setSourceTypeName(sourceTypeMap.get(event.getSourceType()));
r.setDependents(dependents);
r.setCategoryCode(categoryDictItem.getParentCategoryCode());
r.setCategoryPids(eventCategory.getCategoryPids());
r.setReportorMobile(event.getMobile());
r.setReportorIdCard(idCard);
if (eventCategory != null) {
r.setCategoryName(categoryDictItem.getParentCategoryName());
}
return r;
}
/**
* 查询家属
* @param idCard
* @return
*/
private List<IcEventYpAnalysisResultDTO.Dependent> getDependents(String idCard) {
IcResiUserBriefDTO familyInfo = getResultDataOrThrowsException(userOpenFeignClient.findFamilyMemByIdCard(idCard),
ServiceConstant.EPMET_USER_SERVER,
EpmetErrorCode.SERVER_ERROR.getCode(),
"【事件研判分析】查找家属失败",
"【事件研判分析】查找家属失败");
ArrayList<IcEventYpAnalysisResultDTO.Dependent> dependents = new ArrayList<>();
for (HouseUserDTO u : familyInfo.getHouseUserList()) {
dependents.add(new IcEventYpAnalysisResultDTO.Dependent(u.getIcResiUserId(), u.getIcUserName()));
}
return dependents;
}
@Override
public PageData<IcEventResultDTO> getSameCategoryEvents(String orgId, String orgType, String categoryPids, Integer pageNo, Integer pageSize) {
String gridPids = null;
if ("agency".equals(orgType)) {
gridPids = getEventGridPids(orgId);
}
PageHelper.startPage(pageNo, pageSize);
List<IcEventResultDTO> list = baseDao.listEventsByPCategoryInOrg(orgId, gridPids, orgType, categoryPids);
PageInfo<IcEventResultDTO> pageInfo = new PageInfo<>(list);
return new PageData<>(list, pageInfo.getTotal());
}
}

25
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@ -35,8 +35,8 @@
and e.GRID_ID=#{orgId}
</if>
and CUSTOMER_ID = #{customerId}
and CREATED_TIME >= #{queryStartTime}
and CREATED_TIME <![CDATA[<=]]> #{queryEndTime}
and HAPPEN_TIME >= #{queryStartTime}
and HAPPEN_TIME <![CDATA[<=]]> #{queryEndTime}
</where>
group by STATUS
</select>
@ -54,8 +54,8 @@
inner join ic_event_category c on (e.ID = c.IC_EVENT_ID)
<where>
e.CUSTOMER_ID = #{customerId}
and e.CREATED_TIME >= #{queryStartTime}
and e.CREATED_TIME <![CDATA[<=]]> #{queryEndTime}
and e.HAPPEN_TIME >= #{queryStartTime}
and e.HAPPEN_TIME <![CDATA[<=]]> #{queryEndTime}
<if test="orgType == 'agency'">
and e.GRID_PIDS like CONCAT(#{gridPids},'%')
</if>
@ -69,6 +69,7 @@
and c.CATEGORY_CODE = #{categoryCode}
</if>
</where>
order by CREATE_TIME desc
</select>
<select id="listMonthlyEventCount" resultType="com.epmet.dto.result.IcEventMonthlyCountResultDTO">
select t.monthName, count(1) eventCount
@ -141,5 +142,21 @@
order by ie.latest_operated_time desc, rea.sort asc
</select>
<select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">
select e.ID as eventId, e.ADDRESS
from ic_event e
inner join ic_event_category c on (e.ID = c.IC_EVENT_ID)
<where>
<if test="orgType == 'grid'">
e.GRID_ID = #{orgId}
</if>
<if test="orgType == 'agency'">
and e.GRID_PIDS like CONCAT(#{gridPids},'%')
</if>
and c.CATEGORY_PIDS like CONCAT(#{categoryPids},'%')
</where>
order by e.HAPPEN_TIME desc
</select>
</mapper>

16
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@ -748,4 +748,20 @@ public interface EpmetUserOpenFeignClient {
*/
@PostMapping("/epmetuser/icresiuser/getResiUserGroupHomeId")
Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO);
/**
* 使用身份证号查询家属信息
* @param idCard
* @return
*/
@GetMapping("/epmetuser/icresiuser/findFamilyMemByIdCard/{id-card}")
Result<IcResiUserBriefDTO> findFamilyMemByIdCard(@PathVariable("id-card") String idCard);
/**
* 身份证号查询居民信息
* @param idCard
* @return
*/
@PostMapping("/epmetuser/icresiuser/getByResiIdCard/{idcard}")
Result<IcResiUserDTO> getByResiIdCard(@PathVariable("idcard") String idCard);
}

9
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@ -548,4 +548,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseMemberList", formDTO);
}
@Override
public Result<IcResiUserBriefDTO> findFamilyMemByIdCard(String idCard) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "findFamilyMemByIdCard", idCard);
}
@Override
public Result<IcResiUserDTO> getByResiIdCard(String idCard) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getByResiIdCard", idCard);
}
}

23
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -52,6 +52,7 @@ import com.epmet.constants.ImportTaskConstants;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.IcResiUserEntity;
import com.epmet.enums.IcResiUserTableEnum;
import com.epmet.excel.PartyMemberAgeExportExcel;
import com.epmet.excel.PartyMemberEducationExportExcel;
@ -1037,4 +1038,26 @@ public class IcResiUserController implements ResultDataResolver {
Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
}
/**
* 使用身份证号查询家属信息
* @param idCard
* @return
*/
@GetMapping("findFamilyMemByIdCard/{id-card}")
public Result<IcResiUserBriefDTO> findFamilyMemByIdCard(@PathVariable("id-card") String idCard) {
IcResiUserBriefDTO r = icResiUserService.findFamilyMemByIdCard(idCard);
return new Result<IcResiUserBriefDTO>().ok(r);
}
/**
* 身份证号查询居民信息
* @param idCard
* @return
*/
@PostMapping("getByResiIdCard/{idcard}")
public Result<IcResiUserDTO> getByResiIdCard(@PathVariable("idcard") String idCard) {
IcResiUserDTO resi = icResiUserService.getByResiId(idCard);
return new Result<IcResiUserDTO>().ok(resi);
}
}

4
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@ -334,4 +334,8 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
* @return
*/
List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
IcResiUserBriefDTO findFamilyMemByIdCard(String idCard);
IcResiUserDTO getByResiId(String idCard);
}

19
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@ -41,10 +41,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.SpringContextUtils;
import com.epmet.commons.tools.utils.*;
import com.epmet.constant.IcPlatformConstant;
import com.epmet.constant.IcResiUserConstant;
import com.epmet.constant.UserConstant;
@ -1929,4 +1926,18 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
.collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1));
}
@Override
public IcResiUserBriefDTO findFamilyMemByIdCard(String idCard) {
IcResiUserDTO resi = baseDao.getResiUserByIdCard(idCard, EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID));
if (resi == null) {
return null;
}
return baseDao.selectIcResuUser(resi.getId());
}
@Override
public IcResiUserDTO getByResiId(String idCard) {
return baseDao.getResiUserByIdCard(idCard, EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID));
}
}

Loading…
Cancel
Save