From ab9a2d14d59c6b4a7d2e81d5ad8f10e05c6abd10 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 25 Dec 2019 16:37:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E7=BD=91=E6=A0=BC=E5=8C=96?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E6=83=85?= =?UTF-8?q?=E5=86=B5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpdcPlatformItemController.java | 37 +++++++++++++++++++ .../modules/item/service/ItemService.java | 11 ++++++ .../item/service/impl/ItemServiceImpl.java | 11 ++++++ .../mapper/item/ItemGridPlatformDao.xml | 17 +++++++++ .../esua/epdc/feign/ItemFeignClient.java | 31 ++++++++++++++++ .../fallback/ItemFeignClientFallback.java | 20 ++++++++++ .../events/ItemReportHandleQueryTask.java | 19 ++++++++++ .../events/ItemReportHandleQueryTaskImpl.java | 26 +++++++++++++ 8 files changed, 172 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTaskImpl.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java new file mode 100644 index 000000000..5c754134a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.modules.item.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.item.service.ItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * + * 项目上报网格化平台管理 + * + * @Author：liuchuang + * @Date：2019/12/25 11:16 + */ +@RestController +@RequestMapping("platform/item") +public class EpdcPlatformItemController { + + @Autowired + private ItemService itemService; + + /** + * + * 拉取市北网格化平台项目进度情况 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/25 11:21 + */ + @GetMapping(value = "query") + public Result queryItemHandle() { + return itemService.queryItemHandle(); + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index dfab55000..ecece989b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -290,4 +290,15 @@ public interface ItemService extends BaseService { * @since 2019/12/24 9:03 */ List listOfItemHandleProgressByMobile(String itemId); + + /** + * + * 拉取市北网格化平台项目进度情况 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/25 13:28 + */ + Result queryItemHandle(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index b8f4d700f..591969104 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -997,4 +997,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem gridPlatformHandleLogService.insert(logEntity); } + + @Override + public Result queryItemHandle() { + // 获取已上报网格平台未结案的项目 + + // 拉取处理情况 + + // 保存处理情况 + + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml index 04d528db1..ea0a76dcf 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml @@ -17,5 +17,22 @@ + + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java new file mode 100644 index 000000000..e95ef6de6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -0,0 +1,31 @@ +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.ItemFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * + * 项目模块调用 + * + * @Author：liuchuang + * @Date：2019/12/25 11:07 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = ItemFeignClientFallback.class) +public interface ItemFeignClient { + + /** + * + * 拉取市北网格化平台项目进度情况 + * + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/25 11:11 + */ + @GetMapping(value = "events/platform/item/query", consumes = MediaType.APPLICATION_JSON_VALUE) + Result queryItemHandle(); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java new file mode 100644 index 000000000..8126a9edf --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -0,0 +1,20 @@ +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.ItemFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:07 + */ +@Component +public class ItemFeignClientFallback implements ItemFeignClient { + + @Override + public Result queryItemHandle() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryItemHandle", ""); + } +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTask.java new file mode 100644 index 000000000..838017afb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTask.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.task.events; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:00 + */ +public interface ItemReportHandleQueryTask { + + /** + * + * 拉取市北网格化平台项目进度情况 + * + * @params [params] + * @return void + * @author liuchuang + * @since 2019/12/25 11:02 + */ + void run(String params); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTaskImpl.java new file mode 100644 index 000000000..f890b70d2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemReportHandleQueryTaskImpl.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.task.events; + +import com.elink.esua.epdc.feign.ItemFeignClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Author：liuchuang + * @Date：2019/12/25 11:01 + */ +@Component("ItemHandleQueryTask") +public class ItemReportHandleQueryTaskImpl implements ItemReportHandleQueryTask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ItemFeignClient itemFeignClient; + + @Override + public void run(String params){ + logger.debug("ItemHandleQueryTask定时任务正在执行，参数为：{}", params); + itemFeignClient.queryItemHandle(); + } +}