|
|
|
@ -15,6 +15,8 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; |
|
|
|
import com.epmet.commons.tools.utils.EpmetRequestHolder; |
|
|
|
import com.epmet.dataaggre.constant.OrgConstant; |
|
|
|
import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; |
|
|
|
import com.epmet.dataaggre.constant.OrgConstant; |
|
|
|
import com.epmet.dataaggre.constant.TableConstant; |
|
|
|
import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; |
|
|
|
import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; |
|
|
|
import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; |
|
|
|
@ -23,11 +25,14 @@ import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; |
|
|
|
import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; |
|
|
|
import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; |
|
|
|
import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; |
|
|
|
import com.epmet.dataaggre.dto.govorg.result.*; |
|
|
|
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; |
|
|
|
import com.epmet.dataaggre.entity.govorg.*; |
|
|
|
import com.epmet.dataaggre.entity.govproject.IcEventEntity; |
|
|
|
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; |
|
|
|
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; |
|
|
|
import com.epmet.dataaggre.enums.MenusEnums; |
|
|
|
import com.epmet.dataaggre.redis.GovCustomerMenuRedis; |
|
|
|
import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; |
|
|
|
import com.epmet.dataaggre.service.CoverageService; |
|
|
|
import com.epmet.dataaggre.service.epmetuser.IcResiService; |
|
|
|
@ -35,6 +40,9 @@ import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; |
|
|
|
import com.epmet.dataaggre.service.govorg.GovOrgService; |
|
|
|
import com.epmet.dataaggre.service.govproject.GovProjectService; |
|
|
|
import com.epmet.dataaggre.service.heart.HeartService; |
|
|
|
import com.epmet.dto.GovMenuDTO; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
|
|
@ -69,6 +77,9 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
@Autowired |
|
|
|
private GovOrgCoverageService govOrgCoverageService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private GovCustomerMenuRedis govCustomerMenuRedis; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IcResiCategoryWarnService icResiCategoryWarnService; |
|
|
|
|
|
|
|
@ -217,7 +228,146 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO) { |
|
|
|
return null; |
|
|
|
String customerId = formDTO.getCustomerId(); |
|
|
|
CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); |
|
|
|
if (null == staffInfo){ |
|
|
|
throw new EpmetException("查询工作人员失败："+formDTO.getUserId()); |
|
|
|
} |
|
|
|
formDTO.setOrgId(staffInfo.getAgencyId()); |
|
|
|
CoverageHomeSearchResultDTO result = new CoverageHomeSearchResultDTO(); |
|
|
|
// 缓存的客户菜单
|
|
|
|
List<GovMenuDTO> customerMenuList = govCustomerMenuRedis.getCustomerMenuList(customerId, 0, "gov_menu"); |
|
|
|
// org库配置的
|
|
|
|
List<String> resources = govOrgCoverageService.getAllTypeCoverageByCustomerAndType(customerId, "resources"); |
|
|
|
if (CollectionUtils.isEmpty(resources)){ |
|
|
|
return result; |
|
|
|
} |
|
|
|
if (CollectionUtils.isEmpty(customerMenuList)){ |
|
|
|
return result; |
|
|
|
} |
|
|
|
List<String> tables = new ArrayList<>(); |
|
|
|
customerMenuList.forEach(cm -> { |
|
|
|
resources.forEach(r -> { |
|
|
|
if (cm.getUrl().equals(r)){ |
|
|
|
String tableName = MenusEnums.getValueByUrl(r); |
|
|
|
if (StringUtils.isNotBlank(tableName)){ |
|
|
|
tables.add(tableName); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
if (CollectionUtils.isEmpty(tables)){ |
|
|
|
return result; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(formDTO.getSearchType())){ |
|
|
|
if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_USER)){ |
|
|
|
PageInfo<UserInfoResultDTO> allIcUserPageInfo = getIcUserPageInfo(formDTO); |
|
|
|
result.setUserInfos(allIcUserPageInfo.getList()); |
|
|
|
result.setUserInfosTotal(allIcUserPageInfo.getTotal()); |
|
|
|
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){ |
|
|
|
for (String resource : resources) { |
|
|
|
if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ |
|
|
|
PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO); |
|
|
|
result.setEventInfos(eventPageInfo.getList()); |
|
|
|
result.setEventInfoTotal(eventPageInfo.getTotal()); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
}else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ |
|
|
|
|
|
|
|
} |
|
|
|
}else { |
|
|
|
// 查询居民
|
|
|
|
PageInfo<UserInfoResultDTO> allIcUserPageInfo = getIcUserPageInfo(formDTO); |
|
|
|
result.setUserInfos(allIcUserPageInfo.getList()); |
|
|
|
result.setUserInfosTotal(allIcUserPageInfo.getTotal()); |
|
|
|
List<ResourceInfoResultDTO> reInfos = new ArrayList<>(); |
|
|
|
for (String table : tables) { |
|
|
|
switch (table){ |
|
|
|
case TableConstant.IC_SUPERIOR_RESOURCE: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); |
|
|
|
if (!superiorResourceInfos.isEmpty()){ |
|
|
|
reInfos.addAll(superiorResourceInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_CITY_MANAGEMENT: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> cityManageInfos = govOrgService.getCityManageInfos(formDTO); |
|
|
|
if (!cityManageInfos.isEmpty()){ |
|
|
|
reInfos.addAll(cityManageInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO); |
|
|
|
if (!communitySelOrgInfos.isEmpty()){ |
|
|
|
reInfos.addAll(communitySelOrgInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_DANGEROUS_CHEMICALS: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); |
|
|
|
if (!dangerousChemicalsInfos.isEmpty()){ |
|
|
|
reInfos.addAll(dangerousChemicalsInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_ENTERPRISE: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); |
|
|
|
if (!enterpriseInfos.isEmpty()){ |
|
|
|
reInfos.addAll(enterpriseInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_PUBLIC_SERVICE: |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); |
|
|
|
List<ResourceInfoResultDTO> publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); |
|
|
|
if (!publicServiceInfos.isEmpty()){ |
|
|
|
reInfos.addAll(publicServiceInfos); |
|
|
|
} |
|
|
|
break; |
|
|
|
case TableConstant.IC_EVENT: |
|
|
|
PageInfo<EventInfoResultDTO> eventPageInfo = getEventInfo(formDTO); |
|
|
|
result.setEventInfos(eventPageInfo.getList()); |
|
|
|
result.setEventInfoTotal(eventPageInfo.getTotal()); |
|
|
|
break; |
|
|
|
default: |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
result.setResourceInfos(reInfos); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
public PageInfo<UserInfoResultDTO> getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){ |
|
|
|
PageInfo<UserInfoResultDTO> result = new PageInfo<>(); |
|
|
|
if (formDTO.getIsPage()){ |
|
|
|
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icResiService.getAllIcUser(formDTO)); |
|
|
|
}else { |
|
|
|
List<UserInfoResultDTO> allIcUser = icResiService.getAllIcUser(formDTO); |
|
|
|
result.setTotal(Long.valueOf(String.valueOf(allIcUser.size()))); |
|
|
|
result.setList(allIcUser); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* Desc: 事件查询 |
|
|
|
* @param formDTO |
|
|
|
* @author zxc |
|
|
|
* @date 2022/7/28 16:03 |
|
|
|
*/ |
|
|
|
public PageInfo<EventInfoResultDTO> getEventInfo (CoverageHomeSearchFormDTO formDTO){ |
|
|
|
PageInfo<EventInfoResultDTO> result = new PageInfo<>(); |
|
|
|
if (formDTO.getIsPage()){ |
|
|
|
result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govProjectService.getEventInfos(formDTO)); |
|
|
|
}else { |
|
|
|
List<EventInfoResultDTO> eventInfos = govProjectService.getEventInfos(formDTO); |
|
|
|
result.setTotal(Long.valueOf(String.valueOf(eventInfos.size()))); |
|
|
|
result.setList(eventInfos); |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -283,41 +433,41 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType, |
|
|
|
String categoryKey, String search) { |
|
|
|
|
|
|
|
if (PLACE_TYPE_RESI.equals(placeType)) { |
|
|
|
if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) { |
|
|
|
// 使用分类查询居民信息
|
|
|
|
return icResiService.countResisByCategories4Coverage(customerId, agencyId, |
|
|
|
staffOrgIds, categoryKey, search); |
|
|
|
} else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { |
|
|
|
// 特殊人群
|
|
|
|
return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); |
|
|
|
} else if (PLACE_TYPE_EVENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { |
|
|
|
// 难点痛点
|
|
|
|
return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true); |
|
|
|
} else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) { |
|
|
|
// 城市资源管理
|
|
|
|
return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey); |
|
|
|
} else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) { |
|
|
|
// 社区自组织
|
|
|
|
return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey); |
|
|
|
} else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { |
|
|
|
// 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
|
|
|
|
if (categoryKey.equals("pu_jgzsbm")) { |
|
|
|
String partyUnitType = "3"; |
|
|
|
return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search); |
|
|
|
} |
|
|
|
} else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { |
|
|
|
// 危化企业
|
|
|
|
return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); |
|
|
|
} else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) { |
|
|
|
// 企事业单位巡查
|
|
|
|
return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null); |
|
|
|
} else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) { |
|
|
|
// 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
|
|
|
|
return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT); |
|
|
|
} else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) { |
|
|
|
// 公共服务
|
|
|
|
return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey); |
|
|
|
} else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) { |
|
|
|
// 优势资源
|
|
|
|
return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey); |
|
|
|
} else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){ |
|
|
|
@ -347,7 +497,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
// 根据categoryKey查询类别名称
|
|
|
|
IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey); |
|
|
|
|
|
|
|
if (PLACE_TYPE_RESI.equals(placeType)) { |
|
|
|
if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) { |
|
|
|
// 使用分类查询居民信息
|
|
|
|
List<IcResiUserEntity> resiEntities = icResiService.listResisByCategories4Coverage( |
|
|
|
customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); |
|
|
|
@ -361,7 +511,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
coordinates[1], coordinates[0]); |
|
|
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { |
|
|
|
// 特殊人群
|
|
|
|
List<IcResiInfoResultDTO> resiInfos = icResiService.listSpecialResisBySpecialType( |
|
|
|
customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); |
|
|
|
@ -374,7 +524,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? re.getName() : null, coordinates[1], coordinates[0]); |
|
|
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
} else if (PLACE_TYPE_EVENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { |
|
|
|
// 难点痛点
|
|
|
|
List<IcEventEntity> icEventEntities = govProjectService.searchIcEventEntities( |
|
|
|
customerId, staffOrgIds, search, true, isPage, pageNo, pageSize); |
|
|
|
@ -386,7 +536,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
e.getLatitude(), e.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) { |
|
|
|
// 城市资源管理
|
|
|
|
List<IcCityManagementEntity> cityResources = orgCoverageService.searchCityResourceEntities( |
|
|
|
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); |
|
|
|
@ -396,7 +546,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? resource.getName() : null, resource.getLatitude(), resource.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) { |
|
|
|
// 社区自组织
|
|
|
|
List<IcCommunitySelfOrganizationEntity> l = heartService.searchCommunityOrgEntities( |
|
|
|
customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); |
|
|
|
@ -407,7 +557,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? org.getOrganizationName() : null, org.getLatitude(), org.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { |
|
|
|
// 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7
|
|
|
|
if (categoryKey.equals("pu_jgzsbm")) { |
|
|
|
String partyUnitType = "3"; |
|
|
|
@ -420,7 +570,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
.collect(Collectors.toList()); |
|
|
|
} |
|
|
|
return new ArrayList<>(); |
|
|
|
} else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { |
|
|
|
// 危化企业
|
|
|
|
List<IcDangerousChemicalsEntity> l = orgCoverageService.searchDangerousChemicalEntities( |
|
|
|
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); |
|
|
|
@ -430,7 +580,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) { |
|
|
|
// 企事业单位巡查
|
|
|
|
List<IcEnterisePatrolResultDTO> list = orgCoverageService.listEnterprisePatrol( |
|
|
|
customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize,null); |
|
|
|
@ -440,7 +590,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) { |
|
|
|
// 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定
|
|
|
|
List<IcHouseEntity> houses = orgCoverageService.searchByResiNumber( |
|
|
|
customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT, isPage, pageNo, pageSize); |
|
|
|
@ -458,7 +608,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? houseName : null, latitude, longitude); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
} else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) { |
|
|
|
// 公共服务
|
|
|
|
List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities( |
|
|
|
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); |
|
|
|
@ -466,7 +616,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
.map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, |
|
|
|
isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
} else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { |
|
|
|
} else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) { |
|
|
|
// 优势资源
|
|
|
|
List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities( |
|
|
|
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); |
|
|
|
@ -552,31 +702,31 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
// 没有placetype的
|
|
|
|
categoriesOfThisCoverage.getCategories() |
|
|
|
.add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(), |
|
|
|
c.getCoverageType(), c.getPlaceType(), 0)); |
|
|
|
c.getCoverageType(), c.getPlaceType(), c.getQuantity())); |
|
|
|
} else { |
|
|
|
// 有placetype的
|
|
|
|
AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis()); |
|
|
|
if (placeType == null) { |
|
|
|
placeType = new AnalysisResourceCategoriesResult.PlaceType( |
|
|
|
c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), 0, new ArrayList<>()); |
|
|
|
c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), c.getQuantity(), new ArrayList<>()); |
|
|
|
placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType); |
|
|
|
} |
|
|
|
placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), |
|
|
|
c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), 0)); |
|
|
|
c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), c.getQuantity())); |
|
|
|
|
|
|
|
placeType.setCount(placeType.getCount() + 0); // todo 0改为category的count
|
|
|
|
placeType.setQuantity(placeType.getQuantity() + c.getQuantity()); // todo 0改为category的count
|
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
AtomicReference<Integer> total = new AtomicReference<>(0); |
|
|
|
placeTypeMap.forEach((placeTypeKey, placeType) -> { |
|
|
|
categoriesOfThisCoverage.getPlaceTypesInAnalysis().add(placeType); |
|
|
|
total.updateAndGet(v -> v + placeType.getCount()); |
|
|
|
total.updateAndGet(v -> v + placeType.getQuantity()); |
|
|
|
}); |
|
|
|
|
|
|
|
categoriesOfThisCoverage.setCoverageType(coverage.getKey()); |
|
|
|
categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName()); |
|
|
|
categoriesOfThisCoverage.setCount(total.get()); |
|
|
|
categoriesOfThisCoverage.setQuantity(total.get()); |
|
|
|
results.add(categoriesOfThisCoverage); |
|
|
|
} |
|
|
|
|
|
|
|
@ -601,7 +751,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
if (StringUtils.isEmpty(placeTypeInAnalysis)) { |
|
|
|
// 只有一层，没有子级
|
|
|
|
results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), |
|
|
|
rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); |
|
|
|
rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); |
|
|
|
} else { |
|
|
|
// 有子级，需要使用placeTypeInAnalysis分组
|
|
|
|
List<AnalysisGovernedTargetsResult> targets = placeTypeMap.get(placeTypeInAnalysis); |
|
|
|
@ -610,7 +760,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
placeTypeMap.put(placeTypeInAnalysis, targets); |
|
|
|
} |
|
|
|
targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), |
|
|
|
rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); |
|
|
|
rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
@ -628,7 +778,7 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
List<IcResiCategoryWarnConfigEntity> categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); |
|
|
|
List<AnalysisGovernedTargetsResult> ggfwrqCategories = categoriesNeed2Warn.stream().map(wc -> |
|
|
|
new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(), |
|
|
|
CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getCode(), |
|
|
|
CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getName(), |
|
|
|
0, new ArrayList<>())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); |
|
|
|
|
yinzuomei
3 years ago