diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java index f439263..33a523a 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java @@ -34,6 +34,7 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -61,13 +62,12 @@ public class DataRecallController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("数据补招") @ApiImplicitParam(name = "param", value = "参数", required = true) - public HttpResult recall(@RequestBody List param) { + public HttpResult recall(@RequestBody RecallMessage param) { String methodDescribe = getMethodDescribe("recall"); RecallMessage message = new RecallMessage(); - BaseMessage baseMessage = new BaseMessage(); - if(CollectionUtils.isEmpty(param)){ - LocalDate localDate =LocalDate.now().plusDays(-1); + if(CollectionUtils.isEmpty(param.getData())){ + LocalDate localDate = Objects.isNull(param.getReCallTime())?LocalDate.now().plusDays(-1):param.getReCallTime(); List runMonitorIds = commTerminalGeneralClient.getRunMonitorIds().getData(); List recallDTOList = new ArrayList<>(); runMonitorIds.forEach(temp->{ @@ -94,7 +94,7 @@ public class DataRecallController extends BaseController { produceFeignClient.recall(message); } }else { - message.setData(param); + message.setData(param.getData()); // baseMessage.setMessageBody(JSONObject.toJSONString(message)); produceFeignClient.recall(message); } diff --git a/message/message-api/src/main/java/com/njcn/message/message/RecallMessage.java b/message/message-api/src/main/java/com/njcn/message/message/RecallMessage.java index f4b6011..f60140b 100644 --- a/message/message-api/src/main/java/com/njcn/message/message/RecallMessage.java +++ b/message/message-api/src/main/java/com/njcn/message/message/RecallMessage.java @@ -1,8 +1,10 @@ package com.njcn.message.message; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDate; import java.util.List; /** @@ -14,6 +16,8 @@ import java.util.List; */ @Data public class RecallMessage { + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate reCallTime; private List data; @Data