|
|
|
@ -2,9 +2,6 @@ package com.epmet.service.impl; |
|
|
|
|
|
|
|
import com.epmet.dto.screen.ScreenProjectGridDailyDTO; |
|
|
|
import com.epmet.dto.screen.form.GridCenterPointForm; |
|
|
|
import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity; |
|
|
|
import com.epmet.entity.evaluationindex.screen.ScreenCustomerDeptEntity; |
|
|
|
import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity; |
|
|
|
import com.epmet.entity.org.CustomerAgencyEntity; |
|
|
|
import com.epmet.entity.org.CustomerDepartmentEntity; |
|
|
|
import com.epmet.entity.org.CustomerGridEntity; |
|
|
|
@ -45,10 +42,11 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public void initAgencies() { |
|
|
|
List<CustomerAgencyEntity> agencies2Add = listAgencies2Add(); |
|
|
|
List<CustomerAgencyEntity> agencies2Update = listAgencies2Update(); |
|
|
|
Date statsEndTime = new Date();//DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
|
|
|
|
List<CustomerAgencyEntity> agencies2Add = listAgencies2Add(statsEndTime); |
|
|
|
List<CustomerAgencyEntity> agencies2Update = listAgencies2Update(statsEndTime); |
|
|
|
|
|
|
|
screenCustomerAgencyService.initAgencies(agencies2Add, agencies2Update); |
|
|
|
screenCustomerAgencyService.initAgencies(agencies2Add, agencies2Update, statsEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -56,17 +54,9 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private List<CustomerAgencyEntity> listAgencies2Update() { |
|
|
|
ScreenCustomerAgencyEntity e = screenCustomerAgencyService.getLastUpdatedAgency(); |
|
|
|
|
|
|
|
if (e != null) { |
|
|
|
// 说明不是第一次初始化
|
|
|
|
Date startTime = e.getUpdatedTime(); |
|
|
|
Date endTime = new Date(); |
|
|
|
return originCustomerAgencyService.listAgenciesByUpdatedTime(startTime, endTime); |
|
|
|
} |
|
|
|
|
|
|
|
return new ArrayList<>(); |
|
|
|
private List<CustomerAgencyEntity> listAgencies2Update(Date endTime) { |
|
|
|
Date startTime = screenCustomerAgencyService.getDimLastSyncTime(); |
|
|
|
return originCustomerAgencyService.listAgenciesByUpdatedTime(startTime, endTime); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -74,23 +64,17 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private List<CustomerAgencyEntity> listAgencies2Add() { |
|
|
|
ScreenCustomerAgencyEntity e = screenCustomerAgencyService.getLastAddedAgency(); |
|
|
|
|
|
|
|
Date endTime = new Date(); |
|
|
|
Date startTime = null; |
|
|
|
if (e != null) { |
|
|
|
startTime = e.getCreatedTime(); |
|
|
|
} |
|
|
|
|
|
|
|
private List<CustomerAgencyEntity> listAgencies2Add(Date endTime) { |
|
|
|
Date startTime = screenCustomerAgencyService.getDimLastSyncTime(); |
|
|
|
return originCustomerAgencyService.listAgenciesByCreateTime(null, startTime, endTime); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void initDepartments() { |
|
|
|
List<CustomerDepartmentEntity> depts2Add = listDepts2Add(); |
|
|
|
List<CustomerDepartmentEntity> depts2Update = listDepts2Update(); |
|
|
|
screenCustomerDeptService.addAndUpdateDepartments(depts2Add, depts2Update); |
|
|
|
Date syncEndTime = new Date();//DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
|
|
|
|
List<CustomerDepartmentEntity> depts2Add = listDepts2Add(syncEndTime); |
|
|
|
List<CustomerDepartmentEntity> depts2Update = listDepts2Update(syncEndTime); |
|
|
|
screenCustomerDeptService.addAndUpdateDepartments(depts2Add, depts2Update, syncEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -98,17 +82,19 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private List<CustomerDepartmentEntity> listDepts2Update() { |
|
|
|
ScreenCustomerDeptEntity lastUpdateDept = screenCustomerDeptService.getLastUpdateDept(); |
|
|
|
|
|
|
|
if (lastUpdateDept != null) { |
|
|
|
// 不是第一次初始化
|
|
|
|
Date endTime = new Date(); |
|
|
|
Date startTime = lastUpdateDept.getUpdatedTime(); |
|
|
|
return originCustomerDepartmentService.listDepartmentsByUpdatedTime(startTime, endTime); |
|
|
|
} |
|
|
|
|
|
|
|
return new ArrayList<>(); |
|
|
|
private List<CustomerDepartmentEntity> listDepts2Update(Date syncEndTime) { |
|
|
|
//ScreenCustomerDeptEntity lastUpdateDept = screenCustomerDeptService.getLastUpdateDept();
|
|
|
|
//
|
|
|
|
//if (lastUpdateDept != null) {
|
|
|
|
// // 不是第一次初始化
|
|
|
|
// Date endTime = new Date();
|
|
|
|
// Date startTime = lastUpdateDept.getUpdatedTime();
|
|
|
|
// return originCustomerDepartmentService.listDepartmentsByUpdatedTime(startTime, endTime);
|
|
|
|
//}
|
|
|
|
//return new ArrayList<>();
|
|
|
|
|
|
|
|
Date lastSyncEndTime = screenCustomerDeptService.getLastSyncEndTime(); |
|
|
|
return originCustomerDepartmentService.listDepartmentsByUpdatedTime(lastSyncEndTime, syncEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -116,23 +102,25 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
private List<CustomerDepartmentEntity> listDepts2Add() { |
|
|
|
ScreenCustomerDeptEntity lastAddDept = screenCustomerDeptService.getLastAddDept(); |
|
|
|
|
|
|
|
Date startTime = null; |
|
|
|
Date endTime = new Date(); |
|
|
|
if (lastAddDept != null) { |
|
|
|
startTime = lastAddDept.getCreatedTime(); |
|
|
|
} |
|
|
|
|
|
|
|
return originCustomerDepartmentService.listDepartmentsByCreatedTime(null, startTime, endTime); |
|
|
|
private List<CustomerDepartmentEntity> listDepts2Add(Date syncEndTime) { |
|
|
|
//ScreenCustomerDeptEntity lastAddDept = screenCustomerDeptService.getLastAddDept();
|
|
|
|
//
|
|
|
|
//Date startTime = null;
|
|
|
|
//Date endTime = new Date();
|
|
|
|
//if (lastAddDept != null) {
|
|
|
|
// startTime = lastAddDept.getCreatedTime();
|
|
|
|
//}
|
|
|
|
|
|
|
|
Date startTime = screenCustomerDeptService.getLastSyncEndTime(); |
|
|
|
return originCustomerDepartmentService.listDepartmentsByCreatedTime(null, startTime, syncEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void initGrids() { |
|
|
|
List<CustomerGridEntity> grids2Add = listGrids2Add(); |
|
|
|
List<CustomerGridEntity> grids2Update = listGrids2Update(); |
|
|
|
screenCustomerGridService.addAndUpdateGrids(grids2Add, grids2Update); |
|
|
|
Date syncEndTime = new Date();//DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
|
|
|
|
List<CustomerGridEntity> grids2Add = listGrids2Add(syncEndTime); |
|
|
|
List<CustomerGridEntity> grids2Update = listGrids2Update(syncEndTime); |
|
|
|
screenCustomerGridService.addAndUpdateGrids(grids2Add, grids2Update, syncEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -159,26 +147,32 @@ public class EIDimServiceImpl implements EIDimService { |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
private List<CustomerGridEntity> listGrids2Update() { |
|
|
|
ScreenCustomerGridEntity lastUpdateGrid = screenCustomerGridService.getLastUpdateGrid(); |
|
|
|
if (lastUpdateGrid != null) { |
|
|
|
Date endTime = new Date(); |
|
|
|
Date startTime = lastUpdateGrid.getUpdatedTime(); |
|
|
|
return customerGridService.listUpdatedGridsByUpdateTime(startTime, endTime); |
|
|
|
} |
|
|
|
|
|
|
|
return new ArrayList(); |
|
|
|
private List<CustomerGridEntity> listGrids2Update(Date syncEndTime) { |
|
|
|
//ScreenCustomerGridEntity lastUpdateGrid = screenCustomerGridService.getLastUpdateGrid();
|
|
|
|
//if (lastUpdateGrid != null) {
|
|
|
|
// Date endTime = new Date();
|
|
|
|
// Date startTime = lastUpdateGrid.getUpdatedTime();
|
|
|
|
// return customerGridService.listUpdatedGridsByUpdateTime(startTime, endTime);
|
|
|
|
//}
|
|
|
|
//
|
|
|
|
//return new ArrayList();
|
|
|
|
|
|
|
|
Date lastSyncEndTime = screenCustomerGridService.getLastSyncEndTime(); |
|
|
|
return customerGridService.listUpdatedGridsByUpdateTime(lastSyncEndTime, syncEndTime); |
|
|
|
} |
|
|
|
|
|
|
|
private List<CustomerGridEntity> listGrids2Add() { |
|
|
|
ScreenCustomerGridEntity lastAddGrid = screenCustomerGridService.getLastAddGrid(); |
|
|
|
|
|
|
|
Date endTime = new Date(); |
|
|
|
Date startTime = null; |
|
|
|
if (lastAddGrid != null) { |
|
|
|
startTime = lastAddGrid.getCreatedTime(); |
|
|
|
} |
|
|
|
|
|
|
|
return customerGridService.listGridsByCreateTime(null, startTime, endTime); |
|
|
|
private List<CustomerGridEntity> listGrids2Add(Date syncEndTime) { |
|
|
|
//ScreenCustomerGridEntity lastAddGrid = screenCustomerGridService.getLastAddGrid();
|
|
|
|
//
|
|
|
|
//Date endTime = new Date();
|
|
|
|
//Date startTime = null;
|
|
|
|
//if (lastAddGrid != null) {
|
|
|
|
// startTime = lastAddGrid.getCreatedTime();
|
|
|
|
//}
|
|
|
|
//
|
|
|
|
//return customerGridService.listGridsByCreateTime(null, startTime, endTime);
|
|
|
|
|
|
|
|
Date lastSyncEndTime = screenCustomerGridService.getLastSyncEndTime(); |
|
|
|
return customerGridService.listGridsByCreateTime(null, lastSyncEndTime, syncEndTime); |
|
|
|
} |
|
|
|
} |
|
|
|
|
wangxianzhang
4 years ago