修改补招
This commit is contained in:
@@ -34,6 +34,7 @@ import java.time.LocalTime;
|
|||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@@ -61,13 +62,12 @@ public class DataRecallController extends BaseController {
|
|||||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||||
@ApiOperation("数据补招")
|
@ApiOperation("数据补招")
|
||||||
@ApiImplicitParam(name = "param", value = "参数", required = true)
|
@ApiImplicitParam(name = "param", value = "参数", required = true)
|
||||||
public HttpResult<Boolean> recall(@RequestBody List<RecallMessage.RecallDTO> param) {
|
public HttpResult<Boolean> recall(@RequestBody RecallMessage param) {
|
||||||
String methodDescribe = getMethodDescribe("recall");
|
String methodDescribe = getMethodDescribe("recall");
|
||||||
RecallMessage message = new RecallMessage();
|
RecallMessage message = new RecallMessage();
|
||||||
BaseMessage baseMessage = new BaseMessage();
|
|
||||||
|
|
||||||
if(CollectionUtils.isEmpty(param)){
|
if(CollectionUtils.isEmpty(param.getData())){
|
||||||
LocalDate localDate =LocalDate.now().plusDays(-1);
|
LocalDate localDate = Objects.isNull(param.getReCallTime())?LocalDate.now().plusDays(-1):param.getReCallTime();
|
||||||
List<String> runMonitorIds = commTerminalGeneralClient.getRunMonitorIds().getData();
|
List<String> runMonitorIds = commTerminalGeneralClient.getRunMonitorIds().getData();
|
||||||
List<RecallMessage.RecallDTO> recallDTOList = new ArrayList<>();
|
List<RecallMessage.RecallDTO> recallDTOList = new ArrayList<>();
|
||||||
runMonitorIds.forEach(temp->{
|
runMonitorIds.forEach(temp->{
|
||||||
@@ -94,7 +94,7 @@ public class DataRecallController extends BaseController {
|
|||||||
produceFeignClient.recall(message);
|
produceFeignClient.recall(message);
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
message.setData(param);
|
message.setData(param.getData());
|
||||||
// baseMessage.setMessageBody(JSONObject.toJSONString(message));
|
// baseMessage.setMessageBody(JSONObject.toJSONString(message));
|
||||||
produceFeignClient.recall(message);
|
produceFeignClient.recall(message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package com.njcn.message.message;
|
package com.njcn.message.message;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -14,6 +16,8 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class RecallMessage {
|
public class RecallMessage {
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
private LocalDate reCallTime;
|
||||||
|
|
||||||
private List<RecallDTO> data;
|
private List<RecallDTO> data;
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
Reference in New Issue
Block a user