diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseScreenListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseScreenListFormDTO.java new file mode 100644 index 0000000000..88c1cbb2c9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseScreenListFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: lc + * @create: 2022-06-09 15:12 + **/ +@Data +public class HouseScreenListFormDTO implements Serializable { + + private String agencyId; + private String level; + private Integer pageSize; + private Integer pageNo; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerChildAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerChildAgencyResultDTO.java new file mode 100644 index 0000000000..8d2fabb790 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerChildAgencyResultDTO.java @@ -0,0 +1,143 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; +import lombok.Data; + +import java.io.Serializable; + +/** + * 子组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-20 + */ +@Data +public class CustomerChildAgencyResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + /** + * 客户ID + */ + private String customerId; + + /** + * 上级组织机构ID + */ + private String pid; + + /** + * 所有上级组织机构ID(以英文:隔开) + */ + private String pids; + + /** + * 所有上级名称,以-连接 + */ + private String allParentName; + + /** + * 组织名称 + */ + private String organizationName; + + /** + * 机关级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province） + */ + private String level; + + /** + * 地区编码 + */ + private String areaCode; + + /** + * 总人数 + */ + private Integer totalUser; + + /** + * 省 + */ + private String province; + + /** + * 【城市】名称 + */ + private String city; + + /** + * 【区县】名称 + */ + private String district; + + /** + * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701 + */ + private String parentAreaCode; + + /** + * 街道 + */ + private String street; + + /** + * 【社区】名称0409 + */ + private String community; + + /** + * 坐标 + */ + private String coordinates; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + /** + * 中心点位位置 + */ + private String centerAddress; + + /** + * 组织编码 + */ + private String code; + + /** + * 负责人姓名 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenListResultDTO.java new file mode 100644 index 0000000000..7ed363565e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenListResultDTO.java @@ -0,0 +1,122 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description 房屋 类型 统计 + * @Author lc + * @Date + */ +@NoArgsConstructor +@Data +public class HouseScreenListResultDTO implements Serializable { + private static final long serialVersionUID = -1098032063828430218L; + + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 所属组织的PIDS，包括agency，grid + */ + private String orgIdPath; + + /** + * 小区id + */ + private String neighborHoodId; + + /** + * 片区id，neighbor_hood_part.id,可为空。 + */ + private String partId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id + */ + private String buildingUnitId; + + /** + * 房屋名字后台插入时生成 + */ + private String houseName; + + /** + * 全名:小区，楼栋，单元，房屋 + */ + private String fullName; + + /** + * 门牌号 + */ + private String doorName; + + /** + * 房屋类型，这里存储字典value就可以 + */ + private String houseType; + + /** + * 存储字典value + */ + private String purpose; + + /** + * 1：出租 0：自住 2：闲置 3：未出售 + */ + private Integer rentFlag; + + /** + * 房主姓名 + */ + private String ownerName; + + /** + * 房主电话 + */ + private String ownerPhone; + + /** + * 房主身份证号 + */ + private String ownerIdCard; + + /** + * 排序 + */ + private BigDecimal sort; + + /** + * 备注 + */ + private String remark; + + /** + * 房屋编码 + */ + private String houseCode; + private String houseQrcodeUrl; + + /** + * 居住人数 + */ + private Integer resiNumber; + /** + * 房屋可编辑编码 + */ + private String coding; + + private String microGridId; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenStatisticsResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenStatisticsResultDTO.java new file mode 100644 index 0000000000..f14e640120 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseScreenStatisticsResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description 房屋 类型 统计 + * @Author lc + * @Date + */ +@NoArgsConstructor +@Data +public class HouseScreenStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = -1098032063828430218L; + private String agencyId; + private String agencyName; + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 9f2e8d227e..be4615e909 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -716,4 +716,7 @@ public interface GovOrgOpenFeignClient { @GetMapping("/gov/org/customeragency/getLevelAagencyList/{level}") Result> getLevelAagencyList(@PathVariable("level") String level); + + @GetMapping("/gov/org/customeragency/getChildAgencyList/{agencyId}") + Result> getChildAgencyList(@PathVariable("agencyId") String agencyId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 007e2f728a..fe58d71bf9 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -469,6 +469,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getLevelAagencyList", level); } + @Override + public Result> getChildAgencyList(String agencyId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getChildAgencyList", agencyId); + } + @Override public Result> gridStaff(CustomerGridStaffListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index d7df143542..d00192e33b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -500,4 +500,9 @@ public class CustomerAgencyController { return customerAgencyService.getLevelAagencyList(level); } + @GetMapping("getChildAgencyList/{agencyId}") + public Result> getChildAgencyList(@PathVariable("agencyId") String agencyId) { + return customerAgencyService.getChildAgencyList(agencyId); + } + } 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 f6a889d348..79299b691a 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 @@ -692,4 +692,30 @@ public class HouseController implements ResultDataResolver { return new Result>().ok(result); } + /** + * @Description: 大屏 获取房屋统计 + * @param agencyId: + * @param level: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/5 11:13 + */ + @GetMapping("screen/getScreenHouseStatistics") + public Result> getScreenHouseStatistics(String agencyId,String level) { + List result = houseService.getScreenHouseStatistics(agencyId,level); + return new Result>().ok(result); + } + /** + * @Description: 大屏 获取房屋列表 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/5 15:06 + */ + @GetMapping("screen/getScreenHouseList") + public Result> getScreenHouseList(HouseScreenListFormDTO dto) { + PageData result = houseService.getScreenHouseList(dto); + return new Result>().ok(result); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index 7ea83066d5..6e204a71f9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -337,4 +337,6 @@ public interface CustomerAgencyService extends BaseService Result getCommunityInfoByUserId(String userId); Result> getLevelAagencyList(String level); + + Result> getChildAgencyList(String agencyId); } 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 ad173ce0a3..d53636a394 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 @@ -205,4 +205,8 @@ public interface HouseService { List getStreeHouseStatistics(); List getStreeHouseTypeStatistics(String streetId); + + List getScreenHouseStatistics(String agencyId, String level); + + PageData getScreenHouseList(HouseScreenListFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 73615695ed..95f4f4ea6d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -17,6 +17,7 @@ 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.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -1598,4 +1599,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl>().ok(ConvertUtils.sourceToTarget(result, CustomerAgencyResultDTO.class)); } + @Override + public Result> getChildAgencyList(String agencyId) { + LambdaQueryWrapper childAgencyListLq = + new LambdaQueryWrapper().eq(CustomerAgencyEntity::getPid,agencyId); + List result = baseDao.selectList(childAgencyListLq); + return new Result>().ok(ConvertUtils.sourceToTarget(result, CustomerChildAgencyResultDTO.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 4df6ea7d98..c1ef6d33f3 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 @@ -1403,4 +1403,95 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } return result; } + + @Override + public List getScreenHouseStatistics(String agencyId, String level) { + + List result = new ArrayList<>(); + // 当前可能有两种情况 一种是社区下房屋数量 一种是网格下房屋数量 + if (level.equals("street")){ + LambdaQueryWrapper childAgencyListLq = + new LambdaQueryWrapper().eq(CustomerAgencyEntity::getPid,agencyId); + List communityList = customerAgencyDao.selectList(childAgencyListLq); + communityList.forEach( + community -> { + HouseScreenStatisticsResultDTO dto = new HouseScreenStatisticsResultDTO(); + + LambdaQueryWrapper houseEntityLambdaQueryWrapper + = new LambdaQueryWrapper().likeRight(IcHouseEntity::getOrgIdPath, community.getPids()+ ":" + community.getId()); + List houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper); + dto.setAgencyName(community.getOrganizationName()); + dto.setAgencyId(community.getId()); + dto.setCount(houseEntities.size()); + result.add(dto); + }); + }else if(level.equals("community")){ + + LambdaQueryWrapper gridListLq = + new LambdaQueryWrapper().eq(CustomerGridEntity::getPid,agencyId); + List gridList = customerGridDao.selectList(gridListLq); + gridList.forEach(grid->{ + + HouseScreenStatisticsResultDTO dto = new HouseScreenStatisticsResultDTO(); + dto.setAgencyId(grid.getId()); + dto.setAgencyName(grid.getGridName()); + + LambdaQueryWrapper neighborHoodEntityLambdaQueryWrapper = + new LambdaQueryWrapper().eq(IcNeighborHoodEntity::getGridId,grid.getId()); + List neighborHoodEntities = icNeighborHoodDao.selectList(neighborHoodEntityLambdaQueryWrapper); + if (neighborHoodEntities.size()>0){ + List neighorHoodIds = neighborHoodEntities.stream().map(IcNeighborHoodEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper houseEntityLambdaQueryWrapper + = new LambdaQueryWrapper().in(IcHouseEntity::getNeighborHoodId, neighorHoodIds); + List houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper); + dto.setCount(houseEntities.size()); + } + result.add(dto); + }); + } + return result; + } + + @Override + public PageData getScreenHouseList(HouseScreenListFormDTO dto) { + + List list = new ArrayList<>(); + + PageInfo pageInfo = new PageInfo<>(); + + // 当前可能有两种情况 一种是社区下房屋数量 一种是网格下房屋数量 + if (dto.getLevel().equals("community")) { + LambdaQueryWrapper childAgencyListLq = + new LambdaQueryWrapper().eq(CustomerAgencyEntity::getPid, dto.getAgencyId()); + CustomerAgencyEntity community = customerAgencyDao.selectById(dto.getAgencyId()); + + LambdaQueryWrapper houseEntityLambdaQueryWrapper + = new LambdaQueryWrapper().likeRight(IcHouseEntity::getOrgIdPath, community.getPids() + ":" + community.getId()); + + PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); + List houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper); + + PageInfo page = new PageInfo<>(houseEntities); + pageInfo.setTotal(page.getTotal()); + + list = ConvertUtils.sourceToTarget(houseEntities, HouseScreenListResultDTO.class); + }else if (dto.getLevel().equals("grid")) { + + LambdaQueryWrapper neighborHoodEntityLambdaQueryWrapper = + new LambdaQueryWrapper().eq(IcNeighborHoodEntity::getGridId,dto.getAgencyId()); + List neighborHoodEntities = icNeighborHoodDao.selectList(neighborHoodEntityLambdaQueryWrapper); + if (neighborHoodEntities.size()>0){ + List neighorHoodIds = neighborHoodEntities.stream().map(IcNeighborHoodEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper houseEntityLambdaQueryWrapper + = new LambdaQueryWrapper().in(IcHouseEntity::getNeighborHoodId, neighorHoodIds); + PageHelper.startPage(dto.getPageNo(),dto.getPageSize()); + List houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper); + PageInfo page = new PageInfo<>(houseEntities); + pageInfo.setTotal(page.getTotal()); + list = ConvertUtils.sourceToTarget(houseEntities,HouseScreenListResultDTO.class); + } + } + + return new PageData<>(list,pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserScreenListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserScreenListFormDTO.java new file mode 100644 index 0000000000..8c7da5a200 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserScreenListFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: lc + * @create: 2022-06-09 15:12 + **/ +@Data +public class IcUserScreenListFormDTO implements Serializable { + + private String agencyId; + private String level; + private Integer pageSize; + private Integer pageNo; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenListResultDTO.java new file mode 100644 index 0000000000..67e6b43d39 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenListResultDTO.java @@ -0,0 +1,448 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author lc + * @DateTime 2022/8/5 11:14 + * @DESC + */ +@Data +public class IcUserScreenListResultDTO implements Serializable { + + private static final long serialVersionUID = -3215965796907113918L; + + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * + */ + private String agencyId; + + /** + * + */ + private String pids; + + /** + * 网格ID + */ + private String gridId; + + /** + * 所属小区ID + */ + private String villageId; + + /** + * 所属楼宇Id + */ + private String buildId; + + /** + * 单元id + */ + private String unitId; + + /** + * 所属家庭Id + */ + private String homeId; + + /** + * 是否本地户籍 + */ + private String isBdhj; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + /** + * 联系人 + */ + private String contacts; + + /** + * 联系人电话 + */ + private String contactsMobile; + + /** + * 九小场所url + */ + private String ninePlace; + + /** + * 是否党员 + */ + private String isParty; + + /** + * 是否低保户 + */ + private String isDbh; + + /** + * 是否保障房 + */ + private String isEnsureHouse; + + /** + * 是否失业 + */ + private String isUnemployed; + + /** + * 是否育龄妇女 + */ + private String isYlfn; + + /** + * 是否退役军人 + */ + private String isVeterans; + + /** + * 是否统战人员 + */ + private String isUnitedFront; + + /** + * 是否信访人员 + */ + private String isXfry; + + /** + * 是否志愿者 + */ + private String isVolunteer; + + /** + * 是否老年人 + */ + private String isOldPeople; + + /** + * 是否空巢 + */ + private String isKc; + + /** + * 是否失独 + */ + private String isSd; + + /** + * 是否失能 + */ + private String isSn; + + /** + * 是否失智 + */ + private String isSz; + + /** + * 是否残疾 + */ + private String isCj; + + /** + * 是否大病 + */ + private String isDb; + + /** + * 是否慢病 + */ + private String isMb; + + /** + * 是否特殊人群 + */ + private String isSpecial; + + /** + * 是否租户【是:1 否:0】 + */ + private String isTenant; + + /** + * 是否流动人口【是:1 否:0】 + */ + private String isFloating; + + /** + * 是否新阶层人士【是:1 否:0】 + */ + private String isXjc; + /** + * 文化程度【字典表】 + */ + private String culture; + + /** + * 文化程度备注 + */ + private String cultureRemakes; + + /** + * 特长【字典表】 + */ + private String specialSkill; + + /** + * 兴趣爱好 + */ + private String hobby; + + /** + * 兴趣爱好备注 + */ + private String hobbyRemakes; + + /** + * 宗教信仰 + */ + private String faith; + + /** + * 宗教信仰备注 + */ + private String faithRemakes; + + /** + * 残疾类别【字典表】 + */ + private String cjlb; + + /** + * 残疾登记(状况)【字典表】 + */ + private String cjzk; + + /** + * 残疾证号 + */ + private String cjzh; + + /** + * 残疾说明 + */ + private String cjsm; + + /** + * 有无监护人【yes no】 + */ + private String ynJdr; + + /** + * 有无技能特长【yes no】 + */ + private String ynJntc; + + /** + * 有无劳动能力 + */ + private String ynLdnl; + + /** + * 有无非义务教育阶段助学【yes no】 + */ + private String ynFywjyjdzx; + + /** + * 所患大病 + */ + private String shdb; + + /** + * 患大病时间 + */ + private String dbsj; + + /** + * 所患慢性病 + */ + private String shmxb; + + /** + * 患慢性病时间 + */ + private String mxbsj; + + /** + * 是否参保 + */ + private String isCb; + + /** + * 自付金额 + */ + private String zfje; + + /** + * 救助金额 + */ + private String jzje; + + /** + * 救助时间[yyyy-MM-dd] + */ + private String jzsj; + + /** + * 享受救助明细序号 + */ + private String jzmxxh; + + /** + * 健康信息备注 + */ + private String healthRemakes; + + /** + * 工作单位 + */ + private String gzdw; + + /** + * 职业 + */ + private String zy; + + /** + * 离退休时间 + */ + private String ltxsj; + + /** + * 工作信息备注 + */ + private String workRemake; + + /** + * 退休金额 + */ + private String txje; + + /** + * 月收入 + */ + private String ysr; + + /** + * 籍贯 + */ + private String jg; + + /** + * 户籍所在地 + */ + private String hjszd; + + /** + * 现居住地 + */ + private String xjzd; + + /** + * 人户情况 + */ + private String rhzk; + + /** + * 居住信息备注 + */ + private String jzxxRemakes; + + /** + * 民族【字典表】 + */ + private String mz; + + /** + * 与户主关系【字典表】 + */ + private String yhzgx; + + /** + * 居住情况【字典表】 + */ + private String jzqk; + + /** + * 婚姻状况【字典表】 + */ + private String hyzk; + + /** + * 配偶情况【字典表】 + */ + private String poqk; + + /** + * 有无赡养人 + */ + private String ynSyr; + + /** + * 与赡养人关系【字典表】 + */ + private String ysyrgx; + + /** + * 赡养人电话 + */ + private String syrMobile; + + /** + * 家庭信息备注 + */ + private String jtxxRemakes; + + /** + * 用户状态【0:正常;1:迁出;2:注销】 + */ + private String status; + + /** + * 用户详细状态：01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡 + */ + private String subStatus; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenResultDTO.java new file mode 100644 index 0000000000..b1a85cf6b1 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserScreenResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author lc + * @DateTime 2022/8/5 11:14 + * @DESC + */ +@Data +public class IcUserScreenResultDTO implements Serializable { + + private static final long serialVersionUID = -3215965796907113918L; + + private String agencyId; + + private String agencyName; + + private Integer count; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java index 4042fe761a..13bd2142c5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.io.Serializable; /** - * @Author zxc + * @Author lc * @DateTime 2022/8/5 11:14 * @DESC */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 948ddf94d7..b1a678597c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1331,4 +1331,29 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.getStreetUserTypeStatistics(streetId)); } + /** + * @Description: 大屏 获取居民统计 + * @param agencyId: + * @param level: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/5 16:45 + */ + @GetMapping("screen/getScreenUserStatistics") + public Result> getScreenUserStatistics(String agencyId,String level){ + return new Result>().ok(icResiUserService.getScreenUserStatistics(agencyId,level)); + } + + /** + * @Description: 大屏 获取居民列表 + * @param dto: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/5 16:45 + */ + @GetMapping("screen/getScreenUserList") + public Result> getScreenUserList(IcUserScreenListFormDTO dto) { + PageData result = icResiUserService.getScreenUserList(dto); + return new Result>().ok(result); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index fe1fce8ad6..8aed1cee26 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -511,4 +511,8 @@ public interface IcResiUserService extends BaseService { List getStreetUserStatistics(); IcUserStreetTypeResultDTO getStreetUserTypeStatistics(String streetId); + + List getScreenUserStatistics(String agencyId, String level); + + PageData getScreenUserList(IcUserScreenListFormDTO dto); } 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 36fa652f2e..fc656b98ec 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 @@ -3285,6 +3285,83 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getScreenUserStatistics(String agencyId, String level) { + + List result = new ArrayList<>(); + + if (level.equals("street")){ + List communityList = govOrgOpenFeignClient.getChildAgencyList(agencyId).getData(); + communityList.forEach( + community -> { + IcUserScreenResultDTO dto = new IcUserScreenResultDTO(); + LambdaQueryWrapper userEntityLambdaQueryWrapper + = new LambdaQueryWrapper().eq(IcResiUserEntity::getAgencyId, community.getId()); + List userEntities = baseDao.selectList(userEntityLambdaQueryWrapper); + dto.setAgencyName(community.getOrganizationName()); + dto.setAgencyId(community.getId()); + dto.setCount(userEntities.size()); + result.add(dto); + }); + }else if (level.equals("community")){ + + List gridList = govOrgOpenFeignClient.getGridIListByAgency(agencyId).getData(); + gridList.forEach(grid-> { + + IcUserScreenResultDTO dto = new IcUserScreenResultDTO(); + + LambdaQueryWrapper userEntityLambdaQueryWrapper + = new LambdaQueryWrapper().likeRight(IcResiUserEntity::getGridId, grid.getId()); + List userEntities = baseDao.selectList(userEntityLambdaQueryWrapper); + dto.setAgencyId(grid.getId()); + dto.setAgencyName(grid.getGridName()); + dto.setCount(userEntities.size()); + result.add(dto); + }); + } + return result; + } + + @Override + public PageData getScreenUserList(IcUserScreenListFormDTO dto) { + + List list = new ArrayList<>(); + + PageInfo pageData = new PageInfo<>(); + + if (dto.getLevel().equals("community")){ + + LambdaQueryWrapper userEntityLambdaQueryWrapper + = new LambdaQueryWrapper().eq(IcResiUserEntity::getAgencyId, dto.getAgencyId()); + + PageHelper.startPage(dto.getPageNo(),dto.getPageSize()); + + List userEntities = baseDao.selectList(userEntityLambdaQueryWrapper); + + PageInfo pageInfo = new PageInfo<>(userEntities); + pageData.setTotal(pageInfo.getTotal()); + + list = ConvertUtils.sourceToTarget(userEntities,IcUserScreenListResultDTO.class); + + }else if (dto.getLevel().equals("grid")){ + + LambdaQueryWrapper userEntityLambdaQueryWrapper + = new LambdaQueryWrapper().eq(IcResiUserEntity::getGridId, dto.getAgencyId()); + + PageHelper.startPage(dto.getPageNo(),dto.getPageSize()); + + List userEntities = baseDao.selectList(userEntityLambdaQueryWrapper); + PageInfo pageInfo = new PageInfo<>(userEntities); + pageData.setTotal(pageInfo.getTotal()); + + list = ConvertUtils.sourceToTarget(userEntities,IcUserScreenListResultDTO.class); + + } + + + return new PageData<>(list,pageData.getTotal()); + } + public PaCustomerDTO getCustomerInfo(String appId) { JSONObject jsonObject = new JSONObject(); String data = HttpClientManager.getInstance().sendPostByJSON("https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/" + appId, JSON.toJSONString(jsonObject)).getData();