diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java deleted file mode 100644 index a17d702326..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexServiceAbilityGridMonthlyService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.epmet.service.evaluationindex.extract; - -import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity; - -import java.util.List; - -/** - * 服务能力-网格相关事实表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-09-19 - */ -public interface FactIndexServiceAbilityGridMonthlyService{ - /** - * @return java.util.List - * @param customerId - * @author yinzuomei - * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0 - * @Date 2020/9/21 9:38 - **/ - List initAllGridList(String customerId); - - /** - * @return void - * @param list - * @author yinzuomei - * @description 批量插入网格相关-服务能力指标表 - * @Date 2020/9/21 10:05 - **/ - void insertBatchEntity(List list); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java index 203df08f00..50c76d7cb4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java @@ -2,7 +2,6 @@ package com.epmet.service.evaluationindex.extract.dataToIndex.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DataSourceConstant; import com.epmet.constant.ExtractConstant; @@ -71,7 +70,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService { @Autowired private FactIndexGovrnAblityOrgMonthlyService governAbilityOrgMonthlyService; @Autowired - private FactIndexServiceAbilityGridMonthlyService factIndexServiceAbilityGridMonthlyService; + private FactIndexServiceAblityGridMonthlyService factIndexServiceAbilityGridMonthlyService; @Autowired private FactIndexServiceAblityGridMonthlyService factIndexServiceAblityGridMonthlyService; @Autowired diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java deleted file mode 100644 index fc18939393..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexServiceAbilityGridMonthlyServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.epmet.service.evaluationindex.extract.impl; - -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.constant.DataSourceConstant; -import com.epmet.dao.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyDao; -import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity; -import com.epmet.service.evaluationindex.extract.FactIndexServiceAbilityGridMonthlyService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 服务能力-网格相关事实表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-09-19 - */ -@Service -@Slf4j -@DataSource(DataSourceConstant.EVALUATION_INDEX) -public class FactIndexServiceAbilityGridMonthlyServiceImpl implements FactIndexServiceAbilityGridMonthlyService { - @Autowired - private FactIndexServiceAblityGridMonthlyDao baseDao; - - /** - * @param customerId - * @return java.util.List - * @author yinzuomei - * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0 - * @Date 2020/9/21 9:38 - **/ - @Override - @DataSource(DataSourceConstant.EVALUATION_INDEX) - public List initAllGridList(String customerId) { - return baseDao.initAllGridList(customerId); - } - - /** - * @param list - * @return void - * @author yinzuomei - * @description 批量插入网格相关-服务能力指标表 - * @Date 2020/9/21 10:05 - **/ - @Override - @DataSource(DataSourceConstant.EVALUATION_INDEX) - public void insertBatchEntity(List list) { - baseDao.insertBatchEntity(list); - } -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyService.java index 4075ff2725..84b9862e9e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyService.java @@ -21,6 +21,8 @@ package com.epmet.service.evaluationindex.indexcoll; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity; +import java.util.List; + /** * 服务能力-网格相关事实表 @@ -38,4 +40,22 @@ public interface FactIndexServiceAblityGridMonthlyService extends BaseService + * @param customerId + * @author yinzuomei + * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0 + * @Date 2020/9/21 9:38 + **/ + List initAllGridList(String customerId); + + /** + * @return void + * @param list + * @author yinzuomei + * @description 批量插入网格相关-服务能力指标表 + * @Date 2020/9/21 10:05 + **/ + void insertBatchEntity(List list); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexServiceAblityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexServiceAblityGridMonthlyServiceImpl.java index e9eb00a255..a6683c5fd5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexServiceAblityGridMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexServiceAblityGridMonthlyServiceImpl.java @@ -26,6 +26,8 @@ import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMont import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务能力-网格相关事实表 * @@ -51,4 +53,30 @@ public class FactIndexServiceAblityGridMonthlyServiceImpl extends BaseServiceImp deleteNum = baseDao.deleteFactIndexServiceAblityGridMonthly(customerId, monthId); } while (deleteNum > NumConstant.ZERO); } + + /** + * @param customerId + * @return java.util.List + * @author yinzuomei + * @description 查询出所有的网格，初始化好 服务能力-网格相关事实表 各个指标值赋值为0 + * @Date 2020/9/21 9:38 + **/ + @Override + @DataSource(DataSourceConstant.EVALUATION_INDEX) + public List initAllGridList(String customerId) { + return baseDao.initAllGridList(customerId); + } + + /** + * @param list + * @return void + * @author yinzuomei + * @description 批量插入网格相关-服务能力指标表 + * @Date 2020/9/21 10:05 + **/ + @Override + @DataSource(DataSourceConstant.EVALUATION_INDEX) + public void insertBatchEntity(List list) { + baseDao.insertBatchEntity(list); + } } \ No newline at end of file