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

factorigin/extractall方法修改

dev_shibei_match
yinzuomei 5 years ago
parent
ba2ef04d62
commit
83fd8e075f
3 changed files with 84 additions and 27 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. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
  2. 104
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
  3. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java
View File

@ -53,6 +53,7 @@ public class FactOriginExtractController {
} else { } else {
factOriginExtractService.extractAll(extractOriginFormDTO); factOriginExtractService.extractAll(extractOriginFormDTO);
} }
factOriginExtractService.extractAll(extractOriginFormDTO);
return new Result(); return new Result();
} }

104
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java
View File

@ -45,15 +45,17 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
@Override @Override
public void extractAll(ExtractOriginFormDTO extractOriginFormDTO) { public void extractAll(ExtractOriginFormDTO extractOriginFormDTO) {
String dateId = extractOriginFormDTO.getDateId();
String customerId = extractOriginFormDTO.getCustomerId(); String customerId = extractOriginFormDTO.getCustomerId();
if (StringUtils.isBlank(dateId)) { if (StringUtils.isBlank(extractOriginFormDTO.getStartDate())||StringUtils.isBlank(extractOriginFormDTO.getEndDate())) {
dateId = DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)); //如果没有设置开始日期、结束日期,默认查询昨天
extractOriginFormDTO.setDateId(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
} }
List<String> customerIds = new ArrayList<>(); List<String> customerIds = new ArrayList<>();
if (StringUtils.isNotBlank(customerId)) { if (StringUtils.isNotBlank(customerId)) {
//指定某个客户
customerIds.add(customerId); customerIds.add(customerId);
} else { } else {
//查询全部客户
int pageNo = NumConstant.ONE; int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_HUNDRED; int pageSize = NumConstant.ONE_HUNDRED;
customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize); customerIds = dimCustomerService.selectCustomerIdPage(pageNo, pageSize);
@ -62,12 +64,12 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
return; return;
} }
} }
String finalDateId = dateId;
customerIds.forEach(cId -> { customerIds.forEach(cId -> {
ExtractOriginFormDTO param = new ExtractOriginFormDTO(); ExtractOriginFormDTO param = new ExtractOriginFormDTO();
param.setCustomerId(cId); param.setCustomerId(cId);
param.setDateId(finalDateId); param.setDateId(extractOriginFormDTO.getDateId());
param.setStartDate(extractOriginFormDTO.getStartDate());
param.setEndDate(extractOriginFormDTO.getEndDate());
log.debug("extractAll param:{}", JSON.toJSONString(param)); log.debug("extractAll param:{}", JSON.toJSONString(param));
submitJob(param); submitJob(param);
}); });
@ -76,33 +78,87 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
private void submitJob(ExtractOriginFormDTO param) { private void submitJob(ExtractOriginFormDTO param) {
threadPool.submit(() -> { threadPool.submit(() -> {
try { if(StringUtils.isNotBlank(param.getDateId())){
groupExtractService.extractGroupData(param); try {
} catch (Exception e) { groupExtractService.extractGroupData(param);
log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(param), e); } catch (Exception e) {
log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
}else if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
try{
List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
for (int i = 0; i < daysBetween.size(); i++) {
String dateDimId = daysBetween.get(i);
param.setDateId(dateDimId);
groupExtractService.extractGroupData(param);
}
}catch(Exception e){
log.error("抽取【小组数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
} }
}); });
threadPool.submit(() -> { threadPool.submit(() -> {
try { if(StringUtils.isNotBlank(param.getDateId())){
factOriginTopicMainDailyService.topicCleaning(param); try {
} catch (Exception e) { factOriginTopicMainDailyService.topicCleaning(param);
log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(param), e); } catch (Exception e) {
log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
}else if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
try {
List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
for (int i = 0; i < daysBetween.size(); i++) {
String dateDimId = daysBetween.get(i);
param.setDateId(dateDimId);
factOriginTopicMainDailyService.topicCleaning(param);
}
} catch (Exception e) {
log.error("抽取【话题数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
} }
}); });
threadPool.submit(() -> { threadPool.submit(() -> {
try { if(StringUtils.isNotBlank(param.getDateId())){
issueExtractService.issueExtractMain(param); try {
issueExtractService.issueExtractLog(param); issueExtractService.issueExtractMain(param);
} catch (Exception e) { issueExtractService.issueExtractLog(param);
log.error("抽取【议题数据】发生异常,参数:" + JSON.toJSONString(param), e); } catch (Exception e) {
log.error("抽取【议题数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
}else if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
try {
List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
for (int i = 0; i < daysBetween.size(); i++) {
String dateDimId = daysBetween.get(i);
param.setDateId(dateDimId);
issueExtractService.issueExtractMain(param);
issueExtractService.issueExtractLog(param);
}
} catch (Exception e) {
log.error("抽取【议题数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
} }
}); });
threadPool.submit(() -> { threadPool.submit(() -> {
try { if(StringUtils.isNotBlank(param.getDateId())){
projectExtractService.saveOriginProjectDaily(param); try {
projectExtractService.extractProjectPeriodData(param); projectExtractService.saveOriginProjectDaily(param);
} catch (Exception e) { projectExtractService.extractProjectPeriodData(param);
log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e); } catch (Exception e) {
log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
}else if(StringUtils.isNotBlank(param.getStartDate()) && StringUtils.isNotBlank(param.getEndDate())){
try {
List<String> daysBetween = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
for (int i = 0; i < daysBetween.size(); i++) {
String dateDimId = daysBetween.get(i);
param.setDateId(dateDimId);
projectExtractService.saveOriginProjectDaily(param);
projectExtractService.extractProjectPeriodData(param);
}
} catch (Exception e) {
log.error("抽取【项目数据】发生异常,参数:" + JSON.toJSONString(param), e);
}
} }
}); });
} }

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
View File

@ -110,13 +110,13 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
* @date 2020/9/24 10:16 上午 * @date 2020/9/24 10:16 上午
*/ */
public void extractDaily(String customerId, String dateId) { public void extractDaily(String customerId, String dateId) {
//党员基本情况 //党员基本情况screen_cpc_base_data
partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId); partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
//先锋模范 //先锋模范screen_pioneer_data
pioneerDataExtractService.extractGridPioneerData(customerId, dateId); pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId); pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId); pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
//公众参与排行（注册人数、参与人数、话题数、议题数、项目数） //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_parti_total_data
publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId); publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId);
} }

Write Preview
Loading…
Cancel
Save