From 3d680859c283e4c18cbe6bfadc9ff76123db1277 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 9 Dec 2022 10:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=A1=E7=90=86=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- .../esua/epdc/feign/AdminFeignClient.java | 26 +++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 23 +++++++++++++++ .../epdc/task/admin/CommunityManageTask.java | 20 +++++++++++++ .../admin/impl/CommunityManageTaskImpl.java | 29 +++++++++++++++++++ .../CategoryDailyReportTaskImpl.java | 3 +- .../{ => impl}/GridOpeningTaskImpl.java | 3 +- .../{ => impl}/EpdcScreenJobTaskImpl.java | 5 ++-- .../ScreenBaseReportPushTaskImpl.java | 3 +- .../ScreenGovernancePushTaskImpl.java | 3 +- .../ScreenGridManagerDataTaskImpl.java | 3 +- .../ScreenGridManagerEventsTaskImpl.java | 3 +- .../ScreenIndexDataPushTaskImpl.java | 3 +- .../ScreenPublicDataPushTaskImpl.java | 3 +- .../screen/{ => impl}/WorkLogTaskImpl.java | 5 ++-- epdc-cloud-parent-yushan | 2 +- 17 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java create mode 100644 epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java create mode 100644 epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/CommunityManageTask.java create mode 100644 epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/impl/CommunityManageTaskImpl.java rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/{ => impl}/CategoryDailyReportTaskImpl.java (91%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/{ => impl}/GridOpeningTaskImpl.java (85%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/EpdcScreenJobTaskImpl.java (71%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenBaseReportPushTaskImpl.java (99%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenGovernancePushTaskImpl.java (96%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenGridManagerDataTaskImpl.java (93%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenGridManagerEventsTaskImpl.java (94%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenIndexDataPushTaskImpl.java (98%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/ScreenPublicDataPushTaskImpl.java (97%) rename epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/{ => impl}/WorkLogTaskImpl.java (74%) diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 9a2f70c..48965c0 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 9a2f70c6215d14eec99c7a9811376550f2bef0d9 +Subproject commit 48965c0cc93cfb5dbaf3f6f649f11ac9856ee8e4 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 128c6a4..f491284 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a +Subproject commit f49128405cd591b9aab7f129df01518c5aea143e diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java new file mode 100644 index 0000000..ee64a71 --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * + * @author zhy + * @date 2022/12/9 10:22 + */ +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) +public interface AdminFeignClient { + + /** + * 获取当日排行榜 + * + * @return + */ + @GetMapping("sys/dept/manage/sendManageDept") + Result sendManageDept(); + +} diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 0000000..e86daa4 --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + +/** + * + * + * @author zhy + * @date 2022/12/9 10:22 + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + @Override + public Result sendManageDept() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "sendCommunityManageDept"); + } + +} diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/CommunityManageTask.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/CommunityManageTask.java new file mode 100644 index 0000000..024658a --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/CommunityManageTask.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.task.admin; + +/** + * + * + * @author zhy + * @date 2022/12/9 10:17 + */ +public interface CommunityManageTask { + + /** + * 社区管理推送 + * + * @param param + * @return void + * @author zhy + * @date 2022/12/9 10:17 + */ + void run(String param); +} diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/impl/CommunityManageTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/impl/CommunityManageTaskImpl.java new file mode 100644 index 0000000..4a8ed52 --- /dev/null +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/admin/impl/CommunityManageTaskImpl.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.task.admin.impl; + +import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.feign.UserFeignClient; +import com.elink.esua.epdc.task.admin.CommunityManageTask; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author zhy + * @date 2022/12/9 10:17 + */ +@Component("communityManageTask") +public class CommunityManageTaskImpl implements CommunityManageTask { + + @Autowired + private AdminFeignClient adminFeignClient; + + @Autowired + private UserFeignClient userFeignClient; + + @Override + public void run(String param) { + adminFeignClient.sendManageDept(); + } +} diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/CategoryDailyReportTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/CategoryDailyReportTaskImpl.java similarity index 91% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/CategoryDailyReportTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/CategoryDailyReportTaskImpl.java index 7bd9a91..182e745 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/CategoryDailyReportTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/CategoryDailyReportTaskImpl.java @@ -1,6 +1,7 @@ -package com.elink.esua.epdc.task.analysis; +package com.elink.esua.epdc.task.analysis.impl; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.analysis.CategoryDailyReportTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/GridOpeningTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/GridOpeningTaskImpl.java similarity index 85% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/GridOpeningTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/GridOpeningTaskImpl.java index b506540..8a76148 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/GridOpeningTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/analysis/impl/GridOpeningTaskImpl.java @@ -1,6 +1,7 @@ -package com.elink.esua.epdc.task.analysis; +package com.elink.esua.epdc.task.analysis.impl; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.analysis.GridOpeningTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/EpdcScreenJobTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/EpdcScreenJobTaskImpl.java similarity index 71% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/EpdcScreenJobTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/EpdcScreenJobTaskImpl.java index 0eff467..ad8ebf3 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/EpdcScreenJobTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/EpdcScreenJobTaskImpl.java @@ -1,6 +1,7 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.EpdcScreenJobTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -9,7 +10,7 @@ import org.springframework.stereotype.Component; * @Date：2021/11/18 17:36 */ @Component("YushanScreen") -public class EpdcScreenJobTaskImpl implements EpdcScreenJobTask{ +public class EpdcScreenJobTaskImpl implements EpdcScreenJobTask { @Autowired private AnalysisFeignClient analysisFeignClient; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenBaseReportPushTaskImpl.java similarity index 99% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenBaseReportPushTaskImpl.java index 9e043cc..49b45a1 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportPushTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenBaseReportPushTaskImpl.java @@ -1,10 +1,11 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenBaseReportParamDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ItemCountParamDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenBaseReportPushTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGovernancePushTaskImpl.java similarity index 96% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGovernancePushTaskImpl.java index 94668e7..4ca4c05 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGovernancePushTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGovernancePushTaskImpl.java @@ -1,9 +1,10 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenGovernanceParamDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenGovernancePushTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerDataTaskImpl.java similarity index 93% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerDataTaskImpl.java index 35bc314..6821101 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerDataTaskImpl.java @@ -1,8 +1,9 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.analysis.pc.screen.form.GmUploaddataParamDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenIndexDataPushTask; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerEventsTaskImpl.java similarity index 94% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerEventsTaskImpl.java index 21aff95..828d750 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenGridManagerEventsTaskImpl.java @@ -1,9 +1,10 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenGridManagerParamDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenIndexDataPushTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenIndexDataPushTaskImpl.java similarity index 98% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenIndexDataPushTaskImpl.java index 0665d6c..05309e4 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenIndexDataPushTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenIndexDataPushTaskImpl.java @@ -1,9 +1,10 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenIndexBasicDataParamDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenIndexDataPushTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenPublicDataPushTaskImpl.java similarity index 97% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenPublicDataPushTaskImpl.java index 09edc8e..960ec79 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/ScreenPublicDataPushTaskImpl.java @@ -1,8 +1,9 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.dto.ScreenJobBasicDataParamDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.ScreenPublicDataPushTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/WorkLogTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/WorkLogTaskImpl.java similarity index 74% rename from epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/WorkLogTaskImpl.java rename to epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/WorkLogTaskImpl.java index 1dd4e29..cf238c0 100644 --- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/WorkLogTaskImpl.java +++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/task/screen/impl/WorkLogTaskImpl.java @@ -1,6 +1,7 @@ -package com.elink.esua.epdc.task.screen; +package com.elink.esua.epdc.task.screen.impl; import com.elink.esua.epdc.feign.AnalysisFeignClient; +import com.elink.esua.epdc.task.screen.WorkLogTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -9,7 +10,7 @@ import org.springframework.stereotype.Component; * @Date：2021/8/28 19:21 */ @Component("workLogTask") -public class WorkLogTaskImpl implements WorkLogTask{ +public class WorkLogTaskImpl implements WorkLogTask { @Autowired private AnalysisFeignClient analysisFeignClient; diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index 6c53fd9..7d5b870 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d +Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c