elink-star
/
epdc-cloud-job-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

产品推送接口 

screenBasicDataPushTask 定时任务加入参
master
liuchuang 4 years ago
parent
b7939d6bca
commit
32d4860761
5 changed files with 90 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epdc-cloud-commons-yushan
  2. 22
      epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
  3. 44
      epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
  4. 88
      epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java
  5. 2
      epdc-cloud-parent-yushan

2
epdc-cloud-commons-yushan

@ -1 +1 @@
Subproject commit f49128405cd591b9aab7f129df01518c5aea143e
Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a

22
epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
View File

@ -27,7 +27,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:49
*/
@PostMapping("analysis/data/stats/kcscreencoll/homepage/platformsummary")
Result homePagePlatformSummary();
Result homePagePlatformSummary(ScreenJobFormDTO formDto);
/**
* 2、议题分析-各类总数
@ -37,7 +37,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/issue/summary")
Result issueSummary();
Result issueSummary(ScreenJobFormDTO formDto);
/**
* 3、议题分析-参与趋势
@ -58,7 +58,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/user/summary")
Result userSummary();
Result userSummary(ScreenJobFormDTO formDto);
/**
* 5、公益互助-志愿者公益时长排名
@ -90,7 +90,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/act/summary")
Result actSummary();
Result actSummary(ScreenJobFormDTO formDto);
/**
* 8、公益互助-活动次数趋势
@ -111,7 +111,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/act/volunteersummary")
Result actVolunteerSummary();
Result actVolunteerSummary(ScreenJobFormDTO formDto);
/**
* 10、项目分析-各类总数
@ -121,7 +121,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/project/summary")
Result projectSummary();
Result projectSummary(ScreenJobFormDTO formDto);
/**
* 11、项目分析-按分类统计
@ -131,7 +131,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/project/categorysummary")
Result projectCategorySummary();
Result projectCategorySummary(ScreenJobFormDTO formDto);
/**
* 12、项目分析-满意度分析
@ -152,7 +152,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/news/summary")
Result newsSummary();
Result newsSummary(ScreenJobFormDTO formDto);
/**
* 14、党建声音-新闻阅读参与趋势
@ -184,7 +184,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/news/categoryanalysis")
Result newsCategoryAnalysis();
Result newsCategoryAnalysis(ScreenJobFormDTO formDto);
/**
* 17、邻里党群-各类总数汇总
@ -194,7 +194,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/group/summary")
Result groupSummary();
Result groupSummary(ScreenJobFormDTO formDto);
/**
* 18、邻里党群-小组详情
@ -204,7 +204,7 @@ public interface AnalysisFeignClient {
* @since 2020/9/9 15:55
*/
@PostMapping("analysis/data/stats/kcscreencoll/group/detail")
Result groupDetail();
Result groupDetail(ScreenJobFormDTO formDto);
/**
* 19、邻里党群-话题参与趋势

44
epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
View File

@ -16,13 +16,13 @@ import org.springframework.stereotype.Component;
public class AnalysisFeignClientFallback implements AnalysisFeignClient {
@Override
public Result homePagePlatformSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "homePagePlatformSummary");
public Result homePagePlatformSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "homePagePlatformSummary", formDto);
}
@Override
public Result issueSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "issueSummary");
public Result issueSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "issueSummary", formDto);
}
@Override
@ -31,8 +31,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result userSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "userSummary");
public Result userSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "userSummary", formDto);
}
@Override
@ -46,8 +46,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result actSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "actSummary");
public Result actSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "actSummary", formDto);
}
@Override
@ -56,18 +56,18 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result actVolunteerSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "actVolunteerSummary");
public Result actVolunteerSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "actVolunteerSummary", formDto);
}
@Override
public Result projectSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "projectSummary");
public Result projectSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "projectSummary", formDto);
}
@Override
public Result projectCategorySummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "projectCategorySummary");
public Result projectCategorySummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "projectCategorySummary", formDto);
}
@Override
@ -76,8 +76,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result newsSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "newsSummary");
public Result newsSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "newsSummary", formDto);
}
@Override
@ -91,18 +91,18 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result newsCategoryAnalysis() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "newsCategoryAnalysis");
public Result newsCategoryAnalysis(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "newsCategoryAnalysis", formDto);
}
@Override
public Result groupSummary() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "groupSummary");
public Result groupSummary(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "groupSummary", formDto);
}
@Override
public Result groupDetail() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "groupDetail");
public Result groupDetail(ScreenJobFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "groupDetail", formDto);
}
@Override

88
epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenBasicDataPushTaskImpl.java
View File

@ -50,41 +50,41 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
public Integer call() throws Exception {
Thread.sleep(200);
if (methodIndex == 0) {
homePagePlatformSummary();
homePagePlatformSummary(paramDto.getHomePagePlatformSummary());
} else if (methodIndex == 1){
issueSummary();
issueSummary(paramDto.getIssueSummary());
} else if (methodIndex == 2){
issueTrend(paramDto.getIssueTrend());
} else if (methodIndex == 3){
userSummary();
userSummary(paramDto.getUserSummary());
} else if (methodIndex == 4){
volunteerHeartRank(paramDto.getVolunteerHeartRank());
} else if (methodIndex == 5){
userUserHeartRank(paramDto.getUserUserHeartRank());
} else if (methodIndex == 6){
actSummary();
actSummary(paramDto.getActSummary());
} else if (methodIndex == 7){
actTrend(paramDto.getActTrend());
} else if (methodIndex == 8){
actVolunteerSummary();
actVolunteerSummary(paramDto.getActVolunteerSummary());
} else if (methodIndex == 9){
projectSummary();
projectSummary(paramDto.getProjectSummary());
} else if (methodIndex == 10){
projectCategorySummary();
projectCategorySummary(paramDto.getProjectCategorySummary());
} else if (methodIndex == 11){
projectStatisticAnalysis(paramDto.getProjectStatisticAnalysis());
} else if (methodIndex == 12){
newsSummary();
newsSummary(paramDto.getNewsSummary());
} else if (methodIndex == 13){
newsTrend(paramDto.getNewsTrend());
} else if (methodIndex == 14){
newsHotRank(paramDto.getNewsHotRank());
} else if (methodIndex == 15){
newsCategoryAnalysis();
newsCategoryAnalysis(paramDto.getNewsCategoryAnalysis());
} else if (methodIndex == 16){
groupSummary();
groupSummary(paramDto.getGroupSummary());
} else if (methodIndex == 17){
groupDetail();
groupDetail(paramDto.getGroupDetail());
} else if (methodIndex == 18){
groupTopicTrend(paramDto.getGroupTopicTrend());
} else if (methodIndex == 19){
@ -109,11 +109,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 15:47
*/
public void homePagePlatformSummary() {
public void homePagePlatformSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|首页-平台各类总数上报>定时任务开始执行");
analysisFeignClient.homePagePlatformSummary();
analysisFeignClient.homePagePlatformSummary(formDto);
logger.info("<" + methodName + "|首页-平台各类总数上报>定时任务执行结束");
}
@ -124,11 +126,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void issueSummary() {
public void issueSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|议题分析-各类总数>定时任务开始执行");
analysisFeignClient.issueSummary();
analysisFeignClient.issueSummary(formDto);
logger.info("<" + methodName + "|议题分析-各类总数>定时任务执行结束");
}
@ -157,11 +161,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void userSummary() {
public void userSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|用户分析-各类总数>定时任务开始执行");
analysisFeignClient.userSummary();
analysisFeignClient.userSummary(formDto);
logger.info("<" + methodName + "|用户分析-各类总数>定时任务执行结束");
}
@ -213,11 +219,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void actSummary() {
public void actSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|公益互助-活动各类总数>定时任务开始执行");
analysisFeignClient.actSummary();
analysisFeignClient.actSummary(formDto);
logger.info("<" + methodName + "|公益互助-活动各类总数>定时任务执行结束");
}
@ -246,11 +254,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void actVolunteerSummary() {
public void actVolunteerSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|公益互助-志愿者画像>定时任务开始执行");
analysisFeignClient.actVolunteerSummary();
analysisFeignClient.actVolunteerSummary(formDto);
logger.info("<" + methodName + "|公益互助-志愿者画像>定时任务执行结束");
}
@ -261,11 +271,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void projectSummary() {
public void projectSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|项目分析-各类总数>定时任务开始执行");
analysisFeignClient.projectSummary();
analysisFeignClient.projectSummary(formDto);
logger.info("<" + methodName + "|项目分析-各类总数>定时任务执行结束");
}
@ -276,11 +288,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void projectCategorySummary() {
public void projectCategorySummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|项目分析-按分类统计>定时任务开始执行");
analysisFeignClient.projectCategorySummary();
analysisFeignClient.projectCategorySummary(formDto);
logger.info("<" + methodName + "|项目分析-按分类统计>定时任务执行结束");
}
@ -309,11 +323,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void newsSummary() {
public void newsSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|党建声音-新闻各类总数汇总>定时任务开始执行");
analysisFeignClient.newsSummary();
analysisFeignClient.newsSummary(formDto);
logger.info("<" + methodName + "|党建声音-新闻各类总数汇总>定时任务执行结束");
}
@ -365,11 +381,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void newsCategoryAnalysis() {
public void newsCategoryAnalysis(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|党建声音-新闻按类别统计>定时任务开始执行");
analysisFeignClient.newsCategoryAnalysis();
analysisFeignClient.newsCategoryAnalysis(formDto);
logger.info("<" + methodName + "|党建声音-新闻按类别统计>定时任务执行结束");
}
@ -380,11 +398,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void groupSummary() {
public void groupSummary(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|邻里党群-各类总数汇总>定时任务开始执行");
analysisFeignClient.groupSummary();
analysisFeignClient.groupSummary(formDto);
logger.info("<" + methodName + "|邻里党群-各类总数汇总>定时任务执行结束");
}
@ -395,11 +415,13 @@ public class ScreenBasicDataPushTaskImpl implements ScreenBasicDataPushTask {
* @author Liuchuang
* @since 2020/9/9 16:48
*/
public void groupDetail() {
public void groupDetail(String yearMonthDay) {
ScreenJobFormDTO formDto = new ScreenJobFormDTO();
formDto.setYearMonth(yearMonthDay);
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|邻里党群-小组详情>定时任务开始执行");
analysisFeignClient.groupDetail();
analysisFeignClient.groupDetail(formDto);
logger.info("<" + methodName + "|邻里党群-小组详情>定时任务执行结束");
}

2
epdc-cloud-parent-yushan

@ -1 +1 @@
Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c
Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d
Write Preview
Loading…
Cancel
Save