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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java

@@ -17,6 +17,6 @@ public class DataStatsApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(DataStatsApplication.class ,args);
-//        HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() +" DataStatsApplication started!");
+        HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() +" DataStatsApplication started!");
     }
 }

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

@@ -37,7 +37,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
     @Autowired
     private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao;
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyMemberData(List<GridPartyMemberDataFormDTO> formDTO, String customerId) {
@@ -51,7 +51,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridPartyAbility(List<GridPartyAbilityFormDTO> formDTO, String customerId) {
@@ -65,7 +65,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgPartyAbility(List<OrgPartyAbilityFormDTO> formDTO, String customerId) {
@@ -83,7 +83,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridServiceAbility(List<GridServiceAbilityFormDTO> formDTO, String customerId) {
@@ -97,7 +97,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgServiceAbility(List<OrgServiceAbilityFormDTO> formDTO, String customerId) {
@@ -115,7 +115,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertGridGovrnAbility(List<GridGovrnAbilityFormDTO> formDTO, String customerId) {
@@ -129,7 +129,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertOrgGovrnAbility(List<OrgGovrnAbilityFormDTO> formDTO, String customerId) {
@@ -147,7 +147,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         }
     }
 
-    @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertDeptGovrnAbility(List<DeptGovrnAbilityFormDTO> formDTO, String customerId) {