From 4c3ca08c115e9dafc527e1b5bbd456cc48d649e2 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 25 Jul 2023 16:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E9=87=8D=E6=96=B0=E4=B8=8A=E6=8A=A5=E5=B8=82?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/controller/ItemController.java | 13 ++++++ .../modules/item/service/ItemService.java | 2 + .../item/service/impl/ItemServiceImpl.java | 21 ++++++++++ .../esua/epdc/feign/ItemFeignClient.java | 6 +++ .../fallback/ItemFeignClientFallback.java | 5 +++ .../task/screen/EventAppealAgainTask.java | 42 +++++++++++++++++++ 6 files changed, 89 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/EventAppealAgainTask.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 9f14bb002..58a3a5e3f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -727,5 +727,18 @@ public class ItemController { return itemService.changeCategory(dto); } + + /** + * @Description: 失败的重新上报市平台 + * @param : + * @Return com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lichao + * @Date: 2023/7/25 15:22 + */ + @PostMapping("appealAgain") + public Result appealAgain() { + return itemService.appealAgain(); + } + } 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 7d90c001c..929edff36 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 @@ -812,4 +812,6 @@ public interface ItemService extends BaseService { ReplyTotalLineResultDTO replyTrend(ScreenTotalFormDTO formDTO); ResponseTotalLineResultDTO responseSixHoursTrend(ScreenTotalFormDTO formDTO); + + Result appealAgain(); } 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 705afe487..9a1640eaf 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 @@ -5498,6 +5498,27 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } + @Override + public Result appealAgain() { + + // 查找所有的 没有成功调用市平台的数据 + // 除了诉求登记 + LambdaQueryWrapper lambdaQueryWrapper = new + LambdaQueryWrapper().eq(ItemReportInterfaceLogEntity::getSuccessFlag,0).notLike(ItemReportInterfaceLogEntity::getInterfaceName,"诉求登记"); + List logEntityList = itemReportInterfaceLogDao.selectList(lambdaQueryWrapper); + // 循环上报市平台 将状态改成3 + for (ItemReportInterfaceLogEntity entity : logEntityList) { + try { + cityGridApi.sendItemToCity(entity.getCallMsgBody(), entity.getInterfaceUrl(), entity.getInterfaceName()); + entity.setSuccessFlag("2"); + itemReportInterfaceLogDao.updateById(entity); + }catch (Exception e){ + e.printStackTrace(); + } + } + return new Result(); + } + /** * 重新上报 * 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 index c01f49716..173402d38 100644 --- 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 @@ -69,6 +69,12 @@ public interface ItemFeignClient { @PostMapping("events/item/itemautoclosed") Result itemAutoClosed(); + /** + * @Description 定时任务：失败的重新上报市平台 + **/ + @PostMapping("events/item/appealAgain") + Result appealAgain(); + /** * 获取异常数据 * 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 index 086db236c..5a6c46e10 100644 --- 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 @@ -55,6 +55,11 @@ public class ItemFeignClientFallback implements ItemFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "itemAutoClosed"); } + @Override + public Result appealAgain() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "appealAgain"); + } + /** * 获取异常数据 * diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/EventAppealAgainTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/EventAppealAgainTask.java new file mode 100644 index 000000000..58fa9cdf6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/EventAppealAgainTask.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.task.screen; + +import com.alibaba.fastjson.JSON; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.DataStatisticsFormDTO; +import com.elink.esua.epdc.feign.ItemFeignClient; +import com.elink.esua.epdc.task.ITask; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * @Description: 错误数据 重新上报市平台 + * @Author: lichao + * @Date: 2023/7/25 16:35 + */ +@Component("eventAppealAgainTask") +@Slf4j +public class EventAppealAgainTask implements ITask { + + @Resource + private ItemFeignClient itemFeignClient; + + /** + * 执行定时任务接口 错误数据 重新上报市平台 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + log.info("eventAppealAgainTask定时任务开始执行"); + Result result = itemFeignClient.appealAgain(); + if (result.success()) { + log.info("{}定时任务执行成功,{}"); + } else { + log.error("{}定时任务执行失败:{}"); + } + } + +}