|
@ -21,12 +21,14 @@ import com.epmet.dataaggre.entity.govorg.*; |
|
|
import com.epmet.dataaggre.entity.govproject.IcEventEntity; |
|
|
import com.epmet.dataaggre.entity.govproject.IcEventEntity; |
|
|
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; |
|
|
import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; |
|
|
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; |
|
|
import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; |
|
|
|
|
|
import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; |
|
|
import com.epmet.dataaggre.service.CoverageService; |
|
|
import com.epmet.dataaggre.service.CoverageService; |
|
|
import com.epmet.dataaggre.service.epmetuser.IcResiService; |
|
|
import com.epmet.dataaggre.service.epmetuser.IcResiService; |
|
|
import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; |
|
|
import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; |
|
|
import com.epmet.dataaggre.service.govorg.GovOrgService; |
|
|
import com.epmet.dataaggre.service.govorg.GovOrgService; |
|
|
import com.epmet.dataaggre.service.govproject.GovProjectService; |
|
|
import com.epmet.dataaggre.service.govproject.GovProjectService; |
|
|
import com.epmet.dataaggre.service.heart.HeartService; |
|
|
import com.epmet.dataaggre.service.heart.HeartService; |
|
|
|
|
|
import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; |
|
|
import jodd.util.StringUtil; |
|
|
import jodd.util.StringUtil; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
@ -63,6 +65,9 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private GovOrgCoverageService govOrgCoverageService; |
|
|
private GovOrgCoverageService govOrgCoverageService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private IcResiCategoryWarnService icResiCategoryWarnService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 场所类型常量 |
|
|
* 场所类型常量 |
|
|
*/ |
|
|
*/ |
|
@ -532,6 +537,8 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<AnalysisGovernedTargetsResult> listGovernedTargetCategories() { |
|
|
public List<AnalysisGovernedTargetsResult> listGovernedTargetCategories() { |
|
|
|
|
|
|
|
|
|
|
|
// 1.从表中取数据出来
|
|
|
List<IcCoverageCategoryDictEntity> targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); |
|
|
List<IcCoverageCategoryDictEntity> targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); |
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(targetCategories)) { |
|
|
if (CollectionUtils.isEmpty(targetCategories)) { |
|
@ -569,6 +576,19 @@ public class CoverageServiceImpl implements CoverageService { |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来
|
|
|
|
|
|
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(), |
|
|
|
|
|
0, new ArrayList<>())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); |
|
|
|
|
|
ggfwRq.setPlaceType(CoveragePlaceTypeEnum.RESI.getCode()); |
|
|
|
|
|
ggfwRq.setPlaceTypeName(CoveragePlaceTypeEnum.RESI.getName()); |
|
|
|
|
|
ggfwRq.setChildren(ggfwrqCategories); |
|
|
|
|
|
|
|
|
|
|
|
results.add(ggfwRq); |
|
|
return results; |
|
|
return results; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |