elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_shibei_match
jianjun 5 years ago
parent
be4cc31ecb 65995689cf
commit
1a40e529a1
2 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
  2. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

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

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

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

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

Write Preview
Loading…
Cancel
Save