diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java new file mode 100644 index 0000000000..d826ee778c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java @@ -0,0 +1,9 @@ +package com.epmet.dataaggre.dao.opercustomize; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IcResiCategoryWarnConfigDao extends BaseDao { +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java new file mode 100644 index 0000000000..0738f7e37a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java @@ -0,0 +1,86 @@ +/** + * 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.dataaggre.entity.opercustomize; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 居民类别预警配置表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_category_warn_config") +public class IcResiCategoryWarnConfigEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 项标签 + */ + private String label; + + /** + * 表名 + */ + private String tableName; + + /** + * 列名 + */ + private String columnName; + /** + * 是否预警 1 是 0 否 + */ + private String warn; + + /** + * 排序 + */ + private Integer sort; + + /** + * 等级1阈值 + */ + @TableField(value = "LEVEL_1") + private Integer level1; + + /** + * 等级2阈值 + */ + @TableField(value = "LEVEL_2") + private Integer level2; + + /** + * 等级3阈值 + */ + @TableField(value = "LEVEL_3") + private Integer level3; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 3f09b04d77..dcc72dd756 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -21,12 +21,14 @@ 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.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; 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.dataaggre.service.opercustomize.IcResiCategoryWarnService; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -63,6 +65,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private GovOrgCoverageService govOrgCoverageService; + @Autowired + private IcResiCategoryWarnService icResiCategoryWarnService; + /** * 场所类型常量 */ @@ -532,6 +537,8 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listGovernedTargetCategories() { + + // 1.从表中取数据出来 List targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); if (CollectionUtils.isEmpty(targetCategories)) { @@ -569,6 +576,19 @@ public class CoverageServiceImpl implements CoverageService { }); } + //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 + List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); + List 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; } } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java new file mode 100644 index 0000000000..85b43f948a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java @@ -0,0 +1,9 @@ +package com.epmet.dataaggre.service.opercustomize; + +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; + +import java.util.List; + +public interface IcResiCategoryWarnService { + List listResiCategoriesNeed2Warn(String loginUserCustomerId); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java new file mode 100644 index 0000000000..c3e52bacec --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java @@ -0,0 +1,28 @@ +package com.epmet.dataaggre.service.opercustomize.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.opercustomize.IcResiCategoryWarnConfigDao; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; +import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@DataSource(DataSourceConstant.OPERCUSTOMIZE) +public class IcResiCategoryWarnServiceImpl implements IcResiCategoryWarnService { + + @Autowired + private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao; + + @Override + public List listResiCategoriesNeed2Warn(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiCategoryWarnConfigEntity::getCustomerId, customerId); + query.eq(IcResiCategoryWarnConfigEntity::getWarn, "1"); + return icResiCategoryWarnConfigDao.selectList(query); + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml new file mode 100644 index 0000000000..0da1fddf73 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file