From b8690982545c0e9950ce38199405bd5ae76a3982 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 18 May 2026 21:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/YieldOrderController.java | 15 +++++++++++++++ .../springblade/desk/order/feign/OrderClient.java | 4 ++++ .../order/service/impl/YieldOrderServiceImpl.java | 4 +++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 615a112f2..4f52fe9ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -3,6 +3,8 @@ package org.springblade.desk.order.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -13,6 +15,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -32,6 +35,7 @@ import org.springblade.scheduling.feign.IWorkOrderClient; import org.springframework.web.bind.annotation.*; import java.util.*; +import java.util.stream.Collectors; /** * 应用管理控制器 - 生产订单 @@ -174,6 +178,17 @@ public class YieldOrderController extends BladeController { return R.success(msg); } + @PostMapping("/jobDataVerify") + @Operation(summary = "数据校验", description = "") + public R dataVerify() { + List list = yieldOrderService.list(Wrappers.lambdaQuery().in(YieldOrder::getValidationResult,16001,16003)); + if(CollectionUtils.isNotEmpty(list)){ + List idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList()); + yieldOrderService.dataVerify(idList); + } + return R.success("成功"); + } + /** * 批量确认 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java index fb0280390..1719770aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java @@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.v3.oas.annotations.Hidden; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.hibernate.validator.internal.util.logging.Log; import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.desk.order.pojo.entity.YieldOrder; @@ -46,6 +48,7 @@ import java.util.stream.Collectors; * * @author Chill */ +@Slf4j @NonDS @Hidden() @RestController @@ -77,6 +80,7 @@ public class OrderClient implements IOrderClient { List list = orderService.list(Wrappers.lambdaQuery().in(YieldOrder::getValidationResult,16001,16003)); if(CollectionUtils.isNotEmpty(list)){ List idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList()); + log.info("定时任务合规性校验：{}",idList); orderService.dataVerify(idList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index c0179a328..e9b4b1c01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -206,11 +206,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl yieldOrderList = baseMapper.selectList(queryWrapper); // 遍历订单列表，根据异常钻状态，判断调用的校验方法 - log.info("遍历订单列表，根据异常钻状态，判断调用的校验方法"); + log.info("遍历订单列表，根据异常钻状态，判断调用的校验方法:{}",yieldOrderList.size()); for (YieldOrder yieldOrder : yieldOrderList) { + log.info("合规性校验开始：{}",yieldOrder.getId()); if (YieldOrderEnum.VALIDATION_NO.getCode() == yieldOrder.getValidationResult() || YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode() == yieldOrder.getValidationResult()) { // 进行数据校验，验证不通过，不进行后续验证，直接返回； log.info("进行数据校验，验证不通过，不进行后续验证，直接返回"); + log.info("数据校验：{}",yieldOrder.getId()); if (!this.verifyYieldOrderData(yieldOrder)) { continue; }