diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java index 6e968d3af8..e33179fb84 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java @@ -172,6 +172,67 @@ public class YtHsResUtils { return new YtDataSyncResDTO(); } + /** + * desc:死亡数据同步 + * + * @return + */ + public static YtDataSyncResDTO hunYin(String cardNo, String userName) { + try { + tryAcquire("hunYin"); +// 1)appkey秘钥 +// 2)name姓名 必填 +// 3)idcard身份证号 必填 +// 4)start开始默认0 +// 5)limit每页记录数 + Map param = new HashMap<>(); + param.put(APP_KEY, "FH8dEJXl0WaZ8r2ZgHlNdEnoz"); + param.put("cert_num_man", cardNo); + param.put("name_man", userName); + param.put("start", 0); + param.put("limit", 1); + + log.info("hunYin api param:{}", param); + + Result result = HttpClientManager.getInstance().sendGet(SERVER_URL + "gjmzb_hydjxxhygr_sdsjzx1", param); +// String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":{\"code\":200,\"data\":{\"result\":{\"result\":\"IA:结婚\"},\"code\":\"0\",\"status\":\"success\"},\"message\":\"\"},\"total\":0}"; +// Result result = new Result().ok(mockData); + log.info("hunYin api result:{}", JSON.toJSONString(result)); + if (!result.success()) { + return new YtDataSyncResDTO(); + } + String data = result.getData(); + JSONObject jsonObject = JSON.parseObject(data); + //他们的结果是成功的 + if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) { + //第一层 + JSONObject firstData = JSON.parseObject(jsonObject.getString("data")); + + //第二层 data + if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) { + //第一层 + JSONObject secondData = JSON.parseObject(firstData.getString("data")); + if (secondData != null && secondData.getString("result") != null ) { + //第二层 data + JSONObject thirdData = JSON.parseObject(secondData.getString("result")); + Object fourthData = ""; + if (thirdData != null && thirdData.getString("result") != null){ + fourthData = thirdData.getString("result"); + } + return new YtDataSyncResDTO(200, "", fourthData.toString()); + } + } else { + log.warn("hunYin 调用蓝图接口成功但是蓝图的结果中 省平台失败"); + } + } else { + log.warn("hunYin 调用蓝图接口败"); + } + } catch (Exception e) { + log.error(String.format("烟台hunYin结果查询异常cardNo:%s", cardNo), e); + } + return new YtDataSyncResDTO(); + } + /** * desc:残疾数据同步 * diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java new file mode 100644 index 0000000000..4ce99a8f04 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dto.epmetuser.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:23 + */ +@Data +public class LingShanLianHuResiUserFormDTO extends PageFormDTO { + private String partyCenterHouseId; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java new file mode 100644 index 0000000000..98f4d8889d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:52 + */ +@Data +public class IcResiUserResultDTO { + private String icResiUserId; + private String name; + private String mobile; + private String homeId; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java new file mode 100644 index 0000000000..90a516b53d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +/** + * @Description 灵山大屏-党员中共新户联户群众列表 + * @Author yzm + * @Date 2023/5/19 9:10 + */ +@Data +public class LingShanLianHuResiUserResultDTO extends IcResiUserResultDTO{ + /** + * 与入参一致 + * 党员中心户房屋id, + */ + private String partyCenterHouseId; + /** + * 房主姓名 + */ + private String partyCenterHouseOwnerName; + // 关联的房屋信息 + private String neighborHoodId; + private String neighborHoodName; + private String buildingId; + private String buildingName; + private String buildingUnitId; + private String unitName; + private String doorName; + private String houseId; + + // // 每个房屋里住的居民 + // private List resiList; + + +} + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 263a862971..5a1a3e3a7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; @@ -24,6 +25,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; +import com.epmet.dataaggre.dto.epmetuser.form.LingShanLianHuResiUserFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -567,4 +570,16 @@ public class GovOrgController { } } + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param formDTO + * @return + */ + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + @PostMapping("lianHuResi") + public Result> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) { + return new Result>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId())); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java index 568e74e5cb..8350e4c753 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,11 @@ public interface IcHouseDao extends BaseDao { @Param("houseId") String houseId, @Param("houseRule") List houseRule, @Param("statRule") List statRule); + + /** + * 灵山项目：查询房屋关联的联户房屋 + * @param partyCenterHouseId + * @return + */ + List selectListLianHuHouse(@Param("partyCenterHouseId") String partyCenterHouseId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index ec87a71781..c178cf0da8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -11,7 +11,6 @@ import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; @@ -269,4 +268,11 @@ public interface EpmetUserService { Integer pageNo, Integer pageSize); Integer staffQtyInGridsOfRole(String roleKeyAgent, Set staffIds); + + /** + * 根据房屋id,查询居民信息 + * @param houseIds + * @return + */ + PageData listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List houseIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ea513ee6f5..561b05302f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -1195,4 +1195,34 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve return customerStaffDao.countStaffQtyByStaffIdsAndRole(staffIds, role.getId()); } + + /** + * 根据房屋id,查询居民信息 + * + * @param pageNo + * @param pageSize + * @param houseIds + * @return + */ + @Override + public PageData listIcResiUserByHouseId(Integer pageNo,Integer pageSize,List houseIds) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(IcResiUserEntity::getHomeId, houseIds) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + PageHelper.startPage(pageNo, pageSize); + List list = icResiUserDao.selectList(queryWrapper); + PageInfo pageInfo = new PageInfo<>(list); + + List resultList = new ArrayList<>(); + for (IcResiUserEntity entity : list) { + IcResiUserResultDTO resultDTO = new IcResiUserResultDTO(); + resultDTO.setIcResiUserId(entity.getId()); + resultDTO.setName(entity.getName()); + resultDTO.setMobile(entity.getMobile()); + resultDTO.setHomeId(entity.getHomeId()); + resultList.add(resultDTO); + } + pageInfo.setList(resultList); + return new PageData<>(resultList, pageInfo.getTotal(),pageSize); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index d8ffe1e59b..c9fbed85c9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.beans.LingShanAgentServiceStaffAndGrid; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; @@ -309,4 +310,13 @@ public interface GovOrgService { Set getStaffIdsInGrid(String gridId); List listBelongGridsByStaffId(String staffId); + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 68a8b8dac3..d71e6e04ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -37,10 +37,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; @@ -51,6 +48,7 @@ import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import com.epmet.dataaggre.entity.govorg.CustomerStaffGridEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.excel.GridLivelyDetailExcel; import com.epmet.dataaggre.excel.GridLivelyExcel; import com.epmet.dataaggre.service.commonservice.AreaCodeService; @@ -1572,4 +1570,48 @@ public class GovOrgServiceImpl implements GovOrgService { q2.in(CustomerGridEntity::getId, staffAndGrids.stream().map(CustomerStaffGridEntity::getGridId).collect(Collectors.toList())); return customerGridDao.selectList(q2); } + + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + public PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) { + IcHouseEntity partyHouseInfo=houseDao.selectById(partyCenterHouseId); + List houseList = houseDao.selectListLianHuHouse(partyCenterHouseId); + if (CollectionUtils.isEmpty(houseList)) { + return new PageData<>(); + } + List houseIds = houseList.stream().map(o -> o.getHouseId()).collect(Collectors.toList()); + // 先查询关联的房屋id + PageData resiPage = epmetUserService.listIcResiUserByHouseId(pageNo, pageSize, houseIds); + if (CollectionUtils.isEmpty(resiPage.getList())) { + return new PageData<>(); + } + Map lianHouseMap=houseList.stream().collect(Collectors.toMap(LingShanLianHuResiUserResultDTO :: getHouseId, v -> v, (v1, v2) -> v1)); + List resList=new ArrayList(); + resiPage.getList().forEach(dto->{ + LingShanLianHuResiUserResultDTO resultDTO=ConvertUtils.sourceToTarget(dto,LingShanLianHuResiUserResultDTO.class); + + LingShanLianHuResiUserResultDTO houseInfo = lianHouseMap.get(dto.getHomeId()); + resultDTO.setPartyCenterHouseId(houseInfo.getPartyCenterHouseId()); + resultDTO.setNeighborHoodId(houseInfo.getNeighborHoodId()); + resultDTO.setNeighborHoodName(houseInfo.getNeighborHoodName()); + resultDTO.setBuildingId(houseInfo.getBuildingId()); + resultDTO.setBuildingName(houseInfo.getBuildingName()); + resultDTO.setBuildingUnitId(houseInfo.getBuildingUnitId()); + resultDTO.setUnitName(houseInfo.getUnitName()); + resultDTO.setDoorName(houseInfo.getDoorName()); + resultDTO.setHouseId(houseInfo.getHouseId()); + resultDTO.setPartyCenterHouseId(partyHouseInfo.getOwnerName()); + resList.add(resultDTO); + }); + return new PageData<>(resList, resiPage.getTotal(),pageSize); + } + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml index c679f9a5ce..fea9a017be 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml @@ -38,4 +38,29 @@ + + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java new file mode 100644 index 0000000000..04a8ca81da --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiDeadTask.java @@ -0,0 +1,43 @@ +package com.epmet.task; + + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.DataSyncTaskParam; +import com.epmet.feign.EpmetUserOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description:死亡 + * @Return + * @Author: lichao + * @Date: 2023/5/19 13:47 + */ +@Slf4j +@Component("resiDeadTask") +public class ResiDeadTask implements ITask { + + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + + @Override + public void run(String params) { + DataSyncTaskParam formDTO = new DataSyncTaskParam(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, DataSyncTaskParam.class); + } + formDTO.setCustomerId(""); + + // 死亡 + Result maritalInfoScanTask = userOpenFeignClient.deathInfoScanTask(formDTO); + if (maritalInfoScanTask.success()) { + log.info("resiDeadTask定时任务执行成功"); + } else { + log.error("resiDeadTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); + } + + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java new file mode 100644 index 0000000000..e642cd7599 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ResiMaritalTask.java @@ -0,0 +1,43 @@ +package com.epmet.task; + + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.DataSyncTaskParam; +import com.epmet.feign.EpmetUserOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description:婚姻状况 + * @Return + * @Author: lichao + * @Date: 2023/5/19 13:47 + */ +@Slf4j +@Component("resiMaritalTask") +public class ResiMaritalTask implements ITask { + + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; + + @Override + public void run(String params) { + DataSyncTaskParam formDTO = new DataSyncTaskParam(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, DataSyncTaskParam.class); + } + formDTO.setCustomerId(""); + + // 婚姻 + Result maritalInfoScanTask = userOpenFeignClient.maritalInfoScanTask(formDTO); + if (maritalInfoScanTask.success()) { + log.info("resiMaritalTask定时任务执行成功"); + } else { + log.error("resiMaritalTask定时任务执行失败:" + maritalInfoScanTask.getMsg()); + } + + } +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java index 0a7df6be25..c5db519f45 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java @@ -70,6 +70,7 @@ public class LingshanPartyCenterHouseLianhuDTO implements Serializable { * 联户：联户房屋id */ private String houseId; - + private String longitude; + private String latitude; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java deleted file mode 100644 index 7e179fe4a0..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.epmet.dto.result.lingshan; - -import lombok.Data; - -/** - * @Description - * @Author yzm - * @Date 2023/5/18 10:56 - */ -@Data -public class ScreenPartyCenterHouseDistributionResDTO { - /** - * 小区id - */ - private String neighborHoodId; - private String neighborHoodName; - /** - * 所属楼栋id - */ - private String buildingId; - private String buildingName; - /** - * 所属单元id - */ - private String buildingUnitId; - private String unitName; - - /** - * 房屋名字后台插入时生成 - */ - private String houseName; - /** - * 房屋坐标 - */ - private String longitude; - private String latitude; - - /** - * 灵山项目：是否党员中心户：1是；0不是 - */ - private String partyCenterHouseFlag; -} - diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 971015a298..ac166eaec3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -31,7 +31,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; import com.epmet.dto.result.IcBuildingListResultDTO; @@ -283,5 +285,15 @@ public class BuildingController { } - + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(buildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 32062f26c5..09e4793318 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -48,10 +48,14 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcHouseDao; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.CustomerOrgParameterEntity; -import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -100,9 +104,6 @@ public class HouseController implements ResultDataResolver { @Autowired private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; - @Autowired - private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; - @Autowired private IcHouseDao icHouseDao; @Autowired @@ -708,4 +709,36 @@ public class HouseController implements ResultDataResolver { + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(houseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(houseService.queryHouseDetail(houseId)); + } + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param formDTO + * @return + */ + @MaskResponse(fieldNames = {"showOwnerPhone", "showOwnerIdCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("lingshanScreen/houseList") + public Result> queryHouseListForLingShanScreen(@RequestBody PartyCenterHousePageFormDTO formDTO) { + return new Result>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId())); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java deleted file mode 100644 index fe3123a482..0000000000 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IcBuildingDTO; -import com.epmet.dto.IcHouseDTO; -import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; -import com.epmet.dto.result.lingshan.HouseDetailResultDTO; -import com.epmet.service.IcBuildingService; -import com.epmet.service.IcHouseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... - * @Author yzm - * @Date 2023/5/18 10:05 - */ -@RestController -@RequestMapping("houseScreen") -public class LingShanScreenGovOrgController { - @Autowired - private IcHouseService icHouseService; - @Autowired - private IcBuildingService icBuildingService; - - - /** - * 灵山大屏：查询楼栋坐标 - * - * @param tokenDto - * @param formDTO - * @return - */ - @PostMapping("building-distribution") - public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); - } - - - /** - * 灵山大屏：查询房屋坐标点位 - * 支持根据网格\小区\楼栋id查询 - */ - @PostMapping("house-distribution") - public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); - } - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @PostMapping("houseDetail/{houseId}") - public Result queryHouseDetail(@PathVariable("houseId")String houseId){ - return new Result().ok(icHouseService.queryHouseDetail(houseId)); - } - - - -} - diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java index 7b712e100c..8788e1d6cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java @@ -1,9 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 灵山_党员中心户联户 * @@ -15,5 +18,17 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao selectLianHuHouse(String partyCenterHouseId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 27e1c4c1ee..d1da0c1ae8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; @@ -96,4 +97,13 @@ public interface BuildingService { */ Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) throws IOException; + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 8499b55722..f5cebceb3a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -23,6 +23,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; @@ -211,4 +213,29 @@ public interface HouseService { * @return */ PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * @param buildingId + * @return + */ + PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index 27663c2d94..29453d73f3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -149,4 +149,5 @@ public interface IcBuildingService extends BaseService { * @return */ List buildingDistribution(String customerId, String gridId, String neighborHoodId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index c03cb3d238..997c23aae3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -192,21 +192,5 @@ public interface IcHouseService extends BaseService { */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); - /** - * 灵山大屏：查询房屋坐标点位 - * - * @param gridId - * @param neighborHoodId - * @param buildingId - * @return - */ - List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index c8a7d1fd13..e3638b346b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -869,4 +869,20 @@ public class BuildingServiceImpl implements BuildingService { } + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index ea27654291..5a505422ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -36,6 +36,8 @@ import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.*; import com.epmet.enums.*; import com.epmet.feign.*; @@ -132,7 +134,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Autowired private DataReportOpenFeignClient dataReportOpenFeignClient; - + @Autowired + private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao; /** * 房屋管理-新增房屋 * @@ -1553,4 +1556,61 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + @Override + public List houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = icHouseService.get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param pageNo + * @param pageSize + * @param buildingId + * @return + */ + @Override + public PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId) { + PageHelper.startPage(pageNo, pageSize); + List list = icHouseDao.selectListPartyCenterHouse(null, + null, + null, + null, + buildingId, + null); + list.forEach(item -> { + item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType())); + item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 899b2698dc..b7ce4ca07d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -206,4 +206,5 @@ public class IcBuildingServiceImpl extends BaseServiceImpl list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 42584eceaf..f9e09c123f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -668,10 +668,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl(); } - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId); - List list=partyCenterHouseLianhuDao.selectList(queryWrapper); - return ConvertUtils.sourceToTarget(list,LingshanPartyCenterHouseLianhuDTO.class); + List resultList=partyCenterHouseLianhuDao.selectLianHuHouse(partyCenterHouseId); + return resultList; } /** @@ -726,36 +724,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { - List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); - return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); - } - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @Override - public HouseDetailResultDTO queryHouseDetail(String houseId) { - IcHouseDTO data = get(houseId); - HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); - if (null != resultDTO) { - LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); - countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); - resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); - } - return resultDTO; - } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 1c168e5dd8..509956b15e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -969,6 +969,9 @@ ih.DEL_FLAG = '0' AND b.DEL_FLAG = '0' AND h.DEL_FLAG = '0' + + and ih.customer_id=#{customerId} + AND ih.PARTY_CENTER_HOUSE_FLAG='1' diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml index 285b47922e..1c3072c4bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml @@ -34,4 +34,19 @@ where DEL_FLAG='0' and HOUSE_ID = #{houseId} + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java new file mode 100755 index 0000000000..36326c4dbe --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordMaritalDTO.java @@ -0,0 +1,109 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class DataSyncRecordMaritalDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 婚姻状况 + */ + private String maritalStatusName; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealResult; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java new file mode 100755 index 0000000000..40bc4df4cb --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserTaskLogDTO.java @@ -0,0 +1,74 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class IcResiUserTaskLogDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + + /** + * 婚姻：hunyin + */ + private String type; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index ca832d0643..cb428b8aef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -38,6 +38,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 手机号 */ private String mobile; + private String realMobile; /** * 性别 @@ -48,6 +49,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 身份证号 */ private String idCard; + private String realIdCard; /** * 出生日期 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java index efa7a61b47..3d9cd904b6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LingShanSpecialCrowdListResultDTO.java @@ -23,4 +23,10 @@ public class LingShanSpecialCrowdListResultDTO { @JsonFormat(pattern = "yyyy-MM-dd") private Date updatedTime; + private Integer gender; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date birthday; + + private Integer age; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index ddc7a635e7..27d78c5329 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1009,6 +1009,9 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/dataSyncConfig/deathInfoScanTask") Result deathInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + @PostMapping("/epmetuser/dataSyncConfig/maritalInfoScanTask") + Result maritalInfoScanTask(@RequestBody DataSyncTaskParam formDTO); + @PostMapping("/epmetuser/dataSyncConfig/disabilityInfoScanTask") Result disabilityInfoScanTask(@RequestBody DataSyncTaskParam formDTO); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 3bba7ced02..0b59de63c1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -737,6 +737,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deathInfoScanTask", formDTO); } + @Override + public Result maritalInfoScanTask(DataSyncTaskParam formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "maritalInfoScanTask", formDTO); + } + @Override public Result disabilityInfoScanTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "disabilityInfoScanTask", formDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java index 49da3ee0b9..3394910aaa 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/EpidemicConstant.java @@ -8,11 +8,13 @@ public interface EpidemicConstant { * 残疾人 * 死亡 * 疫苗接种 + * 婚姻状况 */ String DATA_CODE_NAT = "hesuan"; String DATA_CODE_DISABILITY = "canji"; String DATA_CODE_DEATH = "siwang"; String DATA_CODE_VACCINE = "yimiaojiezhong"; + String DATA_CODE_MARITAL = "hunyin"; /** * ic_sync_job 任务类型 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java index 737bf81727..f2d6a0553f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncConfigController.java @@ -152,6 +152,19 @@ public class DataSyncConfigController { return new Result(); } + /** + * @Description: 婚姻信息定时拉取 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/5/18 14:39 + */ + @PostMapping("maritalInfoScanTask") + public Result maritalInfoScanTask(@RequestBody DataSyncTaskParam formDTO){ + dataSyncConfigService.maritalInfoScanTask(formDTO); + return new Result(); + } + /** * @Description 残疾信息定时拉取 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java new file mode 100755 index 0000000000..c06aea31d3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.service.DataSyncRecordMaritalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@RestController +@RequestMapping("dataSyncRecordMarital") +public class DataSyncRecordMaritalController { + + @Autowired + private DataSyncRecordMaritalService dataSyncRecordMaritalService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = dataSyncRecordMaritalService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + DataSyncRecordMaritalDTO data = dataSyncRecordMaritalService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody DataSyncRecordMaritalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dataSyncRecordMaritalService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody DataSyncRecordMaritalDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + dataSyncRecordMaritalService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + dataSyncRecordMaritalService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java new file mode 100755 index 0000000000..60ad0755ca --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserTaskLogController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.service.IcResiUserTaskLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@RestController +@RequestMapping("icResiUserTaskLog") +public class IcResiUserTaskLogController { + + @Autowired + private IcResiUserTaskLogService icResiUserTaskLogService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icResiUserTaskLogService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcResiUserTaskLogDTO data = icResiUserTaskLogService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcResiUserTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icResiUserTaskLogService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcResiUserTaskLogDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icResiUserTaskLogService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icResiUserTaskLogService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java new file mode 100755 index 0000000000..772a5728db --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordMaritalDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.DataSyncRecordMaritalEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Mapper +public interface DataSyncRecordMaritalDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java new file mode 100755 index 0000000000..92800a8c31 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserTaskLogDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcResiUserTaskLogEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Mapper +public interface IcResiUserTaskLogDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java new file mode 100755 index 0000000000..b35c20530b --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordMaritalEntity.java @@ -0,0 +1,79 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("data_sync_record_marital") +public class DataSyncRecordMaritalEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 组织Id + */ + private String agencyId; + + /** + * 组织的pids 含agencyId本身 + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证 + */ + private String idCard; + + /** + * 电话 + */ + private String mobile; + + /** + * 居民Id，ic_resi_user.id + */ + private String icResiUserId; + + /** + * 婚姻状况 + */ + private String maritalStatusName; + + /** + * 处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败 + */ + private Integer dealStatus; + + /** + * 处理结果 + */ + private String dealResult; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java new file mode 100755 index 0000000000..ab9dec6ba5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserTaskLogEntity.java @@ -0,0 +1,46 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_user_task_log") +public class IcResiUserTaskLogEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 0:正常数据 1:特殊数据 + */ + private Integer dataType; + + /** + * 数据数量 + */ + private Integer dataCount; + + /** + * 婚姻：hunyin + */ + private String type; + + private String dataScope; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java index 438453f134..0eb833f62a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/enums/DataSyncEnum.java @@ -14,6 +14,7 @@ public enum DataSyncEnum { SI_WANG("siwang", "死亡数据"), VACCINE("yimiaojiezhong", "疫苗接种"), OTHER("qita","其他"), + HUN_YIN("hunyin", "婚姻状况数据"), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java new file mode 100755 index 0000000000..9a97b80380 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/DataSyncRecordMaritalExcel.java @@ -0,0 +1,72 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class DataSyncRecordMaritalExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id") + private String customerId; + + @Excel(name = "组织Id") + private String agencyId; + + @Excel(name = "组织的pids 含agencyId本身") + private String pids; + + @Excel(name = "网格ID") + private String gridId; + + @Excel(name = "姓名") + private String name; + + @Excel(name = "身份证") + private String idCard; + + @Excel(name = "电话") + private String mobile; + + @Excel(name = "居民Id，ic_resi_user.id") + private String icResiUserId; + + @Excel(name = "婚姻状况") + private String maritalStatusName; + + @Excel(name = "处理状态（更新至居民信息） 0:未处理；1:处理成功；2处理失败") + private Integer dealStatus; + + @Excel(name = "处理结果") + private String dealResult; + + @Excel(name = "删除标识：0.未删除 1.已删除") + private Integer delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java new file mode 100755 index 0000000000..5c258cffd8 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserTaskLogExcel.java @@ -0,0 +1,51 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Data +public class IcResiUserTaskLogExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户Id customer.id") + private String customerId; + + @Excel(name = "0:正常数据 1:特殊数据") + private Integer dataType; + + @Excel(name = "数据数量") + private Integer dataCount; + + @Excel(name = "婚姻：hunyin") + private String type; + + @Excel(name = "删除标识 0.未删除 1.已删除") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java new file mode 100755 index 0000000000..d81e5a8718 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/DataSyncRecordMaritalRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Component +public class DataSyncRecordMaritalRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java new file mode 100755 index 0000000000..9f411f156f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserTaskLogRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Component +public class IcResiUserTaskLogRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java index 300128bc4d..3ec906dc5a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncConfigService.java @@ -142,4 +142,12 @@ public interface DataSyncConfigService extends BaseService */ void vaccineInfoScanTask(DataSyncTaskParam formDTO); + /** + * @Description: 婚姻信息定时拉取 + * @param formDTO: + * @Return void + * @Author: lichao + * @Date: 2023/5/18 14:39 + */ + void maritalInfoScanTask(DataSyncTaskParam formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java new file mode 100755 index 0000000000..078a98ca9f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordMaritalService.java @@ -0,0 +1,83 @@ +package com.epmet.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.DataSyncRecordDeathDTO; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.DataSyncRecordMaritalEntity; + +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +public interface DataSyncRecordMaritalService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return DataSyncRecordMaritalDTO + * @author generator + * @date 2023-05-18 + */ + DataSyncRecordMaritalDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void save(DataSyncRecordMaritalDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void update(DataSyncRecordMaritalDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-05-18 + */ + void delete(String[] ids); + + DataSyncRecordMaritalDTO selectOne(LambdaQueryWrapper queryWrapper); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java new file mode 100755 index 0000000000..471d321d64 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserTaskLogService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.entity.IcResiUserTaskLogEntity; + +import java.util.List; +import java.util.Map; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +public interface IcResiUserTaskLogService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcResiUserTaskLogDTO + * @author generator + * @date 2023-05-18 + */ + IcResiUserTaskLogDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void save(IcResiUserTaskLogDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2023-05-18 + */ + void update(IcResiUserTaskLogDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2023-05-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 8d2c06dfa9..44afdadf4d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -29,10 +29,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.constant.EpidemicConstant; import com.epmet.dao.*; -import com.epmet.dto.DataSyncConfigDTO; -import com.epmet.dto.DataSyncRecordDeathDTO; -import com.epmet.dto.DataSyncRecordDisabilityDTO; -import com.epmet.dto.YTVaccineListDTO; +import com.epmet.dto.*; import com.epmet.dto.form.ConfigSwitchFormDTO; import com.epmet.dto.form.DataSyncTaskParam; import com.epmet.dto.form.ScopeSaveFormDTO; @@ -87,6 +84,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl logEntityLambdaQueryWrapper = new LambdaQueryWrapper().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1"); - IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper); - - List userInfoResultDTOS = new ArrayList<>(); - boolean isNum = false; - int start = 0; - if (logEntity == null){ - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); - if (userInfoResultDTOS.size() < 50000){ - isNum = true; - } - }else{ - if (logEntity.getDataType() == 1){ - userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); - isNum = true; - }else if (logEntity.getDataType() == 0){ - start = logEntity.getDataCount(); - } - } - - IcResiUserDeadTaskLogEntity newLog = new IcResiUserDeadTaskLogEntity(); - newLog.setCreatedTime(new Date()); List dbResiList = null; for (DataSyncConfigDTO config : configData) { + String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"siwang").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + + List userInfoResultDTOS = new ArrayList<>(); + boolean isNum = false; + int start = 0; + if (logEntity == null){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + if (logEntity.getDataType() == 1){ + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + isNum = true; + }else if (logEntity.getDataType() == 0){ + start = logEntity.getDataCount(); + } + + } + + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setDataScope(scope); + newLog.setType("siwang"); + // 设置查询数据范围 formDTO.setOrgList(config.getScopeList()); DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); @@ -336,7 +344,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList) { + try { + List list = new ArrayList<>(); + for (NatUserInfoResultDTO dbResi : dbResiList) { + YtDataSyncResDTO thirdResult = YtHsResUtils.hunYin(dbResi.getIdCard(), dbResi.getName()); + if (200 != thirdResult.getCode()) { + log.warn("hunyin 调用蓝图接口失败了 继续处理下一个人"); + continue; + } + + String thirdResultData = thirdResult.getData(); + if(StringUtils.isBlank(thirdResultData)){ + continue; + } +// JSONObject thirdResultObject = JSON.parseObject(thirdResultData); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordMaritalEntity::getIdCard, dbResi.getIdCard()); + //获取数据库里的记录 + DataSyncRecordMaritalDTO dbMaritaEntity = dataSyncRecordMaritalService.selectOne(queryWrapper); + + JudgeDealStatus judgeDealStatus = new JudgeDealStatus(thirdResultData, dbMaritaEntity).invokeMarital(); + if (judgeDealStatus.isStop()) { + continue; + } + + DataSyncRecordMaritalEntity entity = new DataSyncRecordMaritalEntity(); + if (dbMaritaEntity != null && StringUtils.isNotBlank(dbMaritaEntity.getId())) { + entity.setId(dbMaritaEntity.getId()); + } + entity.setCustomerId(dbResi.getCustomerId()); + entity.setAgencyId(dbResi.getAgencyId()); + entity.setPids(dbResi.getPids()); + entity.setGridId(dbResi.getGridId()); + entity.setName(dbResi.getName()); + entity.setIdCard(dbResi.getIdCard()); + entity.setIcResiUserId(dbResi.getUserId()); + //死亡未获取到数据 + if (thirdResultData != null) { + entity.setMaritalStatusName(thirdResultData); + } + + entity.setDealStatus(NumConstant.ZERO); + entity.setDealResult(StrConstant.EPMETY_STR); + if (judgeDealStatus.isNeedSetStatus) { + entity.setDealResult(judgeDealStatus.dealResult); + entity.setDealStatus(judgeDealStatus.dealStatus); + } + entity.setUpdatedTime(new Date()); +// list.add(entity); + dataSyncRecordMaritalService.saveOrUpdate(entity); + } + if (list.size() == NumConstant.ZERO) { + return; + } +// dataSyncRecordMaritalService.saveOrUpdateBatch(list, NumConstant.TWO_HUNDRED); + } catch (Exception e) { + log.error("hunyin exception", e); + } + } + /** * desc：从数据库获取居民信息 * @@ -1003,6 +1073,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl configData = getConfigData(null, EpidemicConstant.DATA_CODE_MARITAL); + if (CollectionUtils.isEmpty(configData)){ + log.warn("maritalInfoScanTask not exists config data,customer is "+formDTO.getCustomerId()); + return; + } + // 取出 婚姻 拉取数据 范围 + long count = configData.stream().filter(o -> CollectionUtils.isNotEmpty(o.getScopeList())).count(); + if (count < 1) { + log.warn("maritalInfoScanTask scopeList is null"); + return; + } + + + List dbResiList = null; + + for (DataSyncConfigDTO config : configData) { + + String scope = config.getScopeList().stream().map(DataSyncScopeDTO::getId).collect(Collectors.joining(",")); + + // 查询上一次定时任务 居民位置记录 + LambdaQueryWrapper logEntityLambdaQueryWrapper = new LambdaQueryWrapper().eq(IcResiUserTaskLogEntity::getDataScope,scope).eq(IcResiUserTaskLogEntity::getType,"hunyin").orderByDesc(IcResiUserTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserTaskLogEntity logEntity = resiUserTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + // userInfoResultDTOS 待处理的数据存放 + List userInfoResultDTOS = new ArrayList<>(); + + boolean isNum = false; + int start = 0; + // 如果没有log数据 说明第一次进入循环 + if (logEntity == null){ + // 从0开始 优先获取规定的几个社区 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000); + // 如果不满5000条数据 下面再从别的社区取 isNum = true + if (userInfoResultDTOS.size() < 50000){ + isNum = true; + } + }else{ + // 如果有log数据 判断一下上次停留在特殊数据还是普通数据 1是特殊数据（优先的几个社区） + if (logEntity.getDataType() == 1){ + // 从上次停止的数据开始获取 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000); + // 下面再从别的社区取 isNum = true 凑够50000 + isNum = true; + }else if (logEntity.getDataType() == 0){ + // 如果是普通数据 直接从次停留在特殊数据获取 + start = logEntity.getDataCount(); + } + + } + // 建立一个最后插入log的标志 + IcResiUserTaskLogEntity newLog = new IcResiUserTaskLogEntity(); + newLog.setCreatedTime(new Date()); + newLog.setType("hunyin"); + newLog.setDataScope(scope); + + // 设置查询数据范围 + formDTO.setOrgList(config.getScopeList()); + DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode()); + // 如果true 说明之前获取过特殊数据了 把50000补完普通数据 + if (isNum){ + formDTO.setStart(start); + formDTO.setEnd(50000-userInfoResultDTOS.size()); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + dbResiList.addAll(userInfoResultDTOS); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + }else{ + // false 说明之前没有获取过特殊数据了 + formDTO.setStart(start); + formDTO.setEnd(start+50000); + dbResiList = getNatUserInfoFromDbLimit(formDTO); + // 如果不够五万了 从头再来 + if (dbResiList.size()<50000){ + // 特殊数据 + userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size()); + dbResiList.addAll(userInfoResultDTOS); + // 特殊数据不够 在获取普通数据 + if (dbResiList.size() < 50000){ + formDTO.setStart(0); + formDTO.setEnd(50000-dbResiList.size()); + dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO)); + newLog.setDataType(0); + newLog.setDataCount(50000-dbResiList.size()); + + }else{ + newLog.setDataType(1); + newLog.setDataCount(50000-dbResiList.size()); + } + }else{ + newLog.setDataType(0); + newLog.setDataCount(start+50000); + } + } + + + if (CollectionUtils.isEmpty(dbResiList)) { + continue; + } + switch (anEnum) { + case HUN_YIN: + try { + //查询正常状态的居民 + hunYin(dbResiList); + resiUserTaskLogDao.insert(newLog); + log.info("======hunyin信息拉取结束======"); + } catch (Exception e) { + log.error("marry thread execute exception", e); + } + default: + log.warn("没有要处理的数据"); + } + } + + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java new file mode 100755 index 0000000000..417d6e6b18 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordMaritalServiceImpl.java @@ -0,0 +1,92 @@ +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.DataSyncRecordMaritalDao; +import com.epmet.dto.DataSyncRecordDeathDTO; +import com.epmet.dto.DataSyncRecordMaritalDTO; +import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.DataSyncRecordMaritalEntity; +import com.epmet.service.DataSyncRecordMaritalService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 数据同步记录-居民婚姻信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Service +public class DataSyncRecordMaritalServiceImpl extends BaseServiceImpl implements DataSyncRecordMaritalService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, DataSyncRecordMaritalDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, DataSyncRecordMaritalDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public DataSyncRecordMaritalDTO get(String id) { + DataSyncRecordMaritalEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordMaritalDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(DataSyncRecordMaritalDTO dto) { + DataSyncRecordMaritalEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordMaritalEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(DataSyncRecordMaritalDTO dto) { + DataSyncRecordMaritalEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordMaritalEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public DataSyncRecordMaritalDTO selectOne(LambdaQueryWrapper queryWrapper) { + DataSyncRecordMaritalEntity entity = baseDao.selectOne(queryWrapper); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordMaritalDTO.class); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 9f68a6ac4f..31a9f5ed70 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1742,6 +1742,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> mzRes=epmetAdminOpenFeignClient.getNationOption(); if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java new file mode 100755 index 0000000000..3fd079eed6 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserTaskLogServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +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.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.IcResiUserTaskLogDao; +import com.epmet.dto.IcResiUserTaskLogDTO; +import com.epmet.entity.IcResiUserTaskLogEntity; +import com.epmet.service.IcResiUserTaskLogService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 居民定时任务log + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-18 + */ +@Service +public class IcResiUserTaskLogServiceImpl extends BaseServiceImpl implements IcResiUserTaskLogService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcResiUserTaskLogDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcResiUserTaskLogDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcResiUserTaskLogDTO get(String id) { + IcResiUserTaskLogEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcResiUserTaskLogDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcResiUserTaskLogDTO dto) { + IcResiUserTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserTaskLogEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcResiUserTaskLogDTO dto) { + IcResiUserTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserTaskLogEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml new file mode 100755 index 0000000000..18a11ba5d5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordMaritalDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml new file mode 100755 index 0000000000..c1385adc4a --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserTaskLogDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml index 9535299885..d103b6da3c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml @@ -16,6 +16,9 @@ , s.CREATED_TIME , s.UPDATED_TIME , s.SPECIAL_RQLB SPECIAL_TYPES_STR + , r.GENDER + , r.BIRTHDAY + , year(now()) - year(r.BIRTHDAY) as age from ic_resi_user r inner join ic_special s on (r.ID = s.IC_RESI_USER and s.DEL_FLAG = 0) where