增加日志

liweidong
liweidong-hj 2 weeks ago
parent 70e3158d3b
commit b869098254
  1. 15
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java
  2. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/feign/OrderClient.java
  3. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@ -3,6 +3,8 @@ package org.springblade.desk.order.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;
@ -13,6 +15,7 @@ import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController; 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.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
@ -32,6 +35,7 @@ import org.springblade.scheduling.feign.IWorkOrderClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 应用管理控制器 - 生产订单 * 应用管理控制器 - 生产订单
@ -174,6 +178,17 @@ public class YieldOrderController extends BladeController {
return R.success(msg); return R.success(msg);
} }
@PostMapping("/jobDataVerify")
@Operation(summary = "数据校验", description = "")
public R dataVerify() {
List<YieldOrder> list = yieldOrderService.list(Wrappers.<YieldOrder>lambdaQuery().in(YieldOrder::getValidationResult,16001,16003));
if(CollectionUtils.isNotEmpty(list)){
List<Long> idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList());
yieldOrderService.dataVerify(idList);
}
return R.success("成功");
}
/** /**
* 批量确认 * 批量确认
*/ */

@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Hidden;
import lombok.RequiredArgsConstructor; 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.mp.base.BaseEntity;
import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldOrder;
@ -46,6 +48,7 @@ import java.util.stream.Collectors;
* *
* @author Chill * @author Chill
*/ */
@Slf4j
@NonDS @NonDS
@Hidden() @Hidden()
@RestController @RestController
@ -77,6 +80,7 @@ public class OrderClient implements IOrderClient {
List<YieldOrder> list = orderService.list(Wrappers.<YieldOrder>lambdaQuery().in(YieldOrder::getValidationResult,16001,16003)); List<YieldOrder> list = orderService.list(Wrappers.<YieldOrder>lambdaQuery().in(YieldOrder::getValidationResult,16001,16003));
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
List<Long> idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList()); List<Long> idList = list.stream().map(BaseEntity::getId).collect(Collectors.toList());
log.info("定时任务合规性校验:{}",idList);
orderService.dataVerify(idList); orderService.dataVerify(idList);
} }
} }

@ -206,11 +206,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
List<YieldOrder> yieldOrderList = baseMapper.selectList(queryWrapper); List<YieldOrder> yieldOrderList = baseMapper.selectList(queryWrapper);
// 遍历订单列表,根据异常钻状态,判断调用的校验方法 // 遍历订单列表,根据异常钻状态,判断调用的校验方法
log.info("遍历订单列表,根据异常钻状态,判断调用的校验方法"); log.info("遍历订单列表,根据异常钻状态,判断调用的校验方法:{}",yieldOrderList.size());
for (YieldOrder yieldOrder : yieldOrderList) { for (YieldOrder yieldOrder : yieldOrderList) {
log.info("合规性校验开始:{}",yieldOrder.getId());
if (YieldOrderEnum.VALIDATION_NO.getCode() == yieldOrder.getValidationResult() || YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode() == yieldOrder.getValidationResult()) { if (YieldOrderEnum.VALIDATION_NO.getCode() == yieldOrder.getValidationResult() || YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode() == yieldOrder.getValidationResult()) {
// 进行数据校验,验证不通过,不进行后续验证,直接返回; // 进行数据校验,验证不通过,不进行后续验证,直接返回;
log.info("进行数据校验,验证不通过,不进行后续验证,直接返回"); log.info("进行数据校验,验证不通过,不进行后续验证,直接返回");
log.info("数据校验:{}",yieldOrder.getId());
if (!this.verifyYieldOrderData(yieldOrder)) { if (!this.verifyYieldOrderData(yieldOrder)) {
continue; continue;
} }

Loading…
Cancel
Save