Merge remote-tracking branch 'remotes/origin/dev_screen_data'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -3,7 +3,6 @@ package com.epmet.service.evaluationindex.indexcoll.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dao.evaluationindex.indexcal.AgencyScoreDao;
@@ -20,9 +19,6 @@ import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
 import com.epmet.dto.screen.FactIndexGridScoreDTO;
 import com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO;
 import com.epmet.dto.screencoll.form.IndexDataYearlyFormDTO;
-import com.epmet.entity.evaluationindex.indexcal.AgencyScoreEntity;
-import com.epmet.entity.evaluationindex.indexcal.DeptScoreEntity;
-import com.epmet.entity.evaluationindex.screen.FactIndexCommunityScoreEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity;
 import com.epmet.eum.IndexCodeEnum;
@@ -83,7 +79,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     @Autowired
     private ScreenCustomerAgencyDao screenCustomerAgencyDao;
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyMemberData(GridPartyMemberDataFormDTO formDTO, String customerId) {
@@ -99,7 +94,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyAbility(GridPartyAbilityDataFormDTO formDTO, String customerId) {
@@ -114,7 +108,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgPartyAbility(OrgPartyAbilityDataFormDTO formDTO, String customerId) {
@@ -129,7 +122,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridServiceAbility(GridServiceAbilityDataFormDTO formDTO, String customerId) {
@@ -144,7 +136,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgServiceAbility(OrgServiceAbilityDataFormDTO formDTO, String customerId) {
@@ -159,7 +150,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridGovrnAbility(GridGovrnAbilityDataFormDTO formDTO, String customerId) {
@@ -174,7 +164,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgGovrnAbility(OrgGovrnAbilityDataFormDTO formDTO, String customerId) {
@@ -189,7 +178,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertDeptGovrnAbility(DeptGovrnAbilityDataFormDTO formDTO, String customerId) {
@@ -204,7 +192,6 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertScreenIndexDataMonthlyAndYearly(String monthId, String customerId) {