From 9c2530bafbd5f502fd9bdc9abaa7c357d6f91e86 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 06 八月 2024 17:46:00 +0800 Subject: [PATCH] 点位导入导出 --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 24b0eae..415f927 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -33,6 +33,7 @@ import enumeration.general.WorkOrderDistributeWayEnum; import enumeration.general.WorkOrderStatusEnum; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,7 @@ * @author xp * @since 2024-03-05 */ +@Slf4j @Service @RequiredArgsConstructor public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService { @@ -72,20 +74,16 @@ private RedisCache redisCache; @Override - public Result innerAdd(WorkOrder workOrder) throws Exception { - if (! StringUtils.hasText(workOrder.getSerialNumber())) { - throw new Exception("鍒涘缓宸ュ崟鏃讹紝璇蜂紶閫掕澶囩紪鐮�"); - } - if (Objects.isNull(workOrder.getStatus())) { - throw new Exception("鍒涘缓宸ュ崟鏃讹紝璇蜂紶閫掑伐鍗曠姸鎬�"); - } - if (! StringUtils.hasText(workOrder.getErrorType())) { - throw new Exception("鍒涘缓宸ュ崟鏃讹紝璇蜂紶閫掑紓甯哥被鍨�"); - } - workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5)); - workOrder.setCreateTime(DateUtils.getNowDate()); - baseMapper.insert(workOrder); - return Result.ok(); + public Boolean innerAdd(List<WorkOrder> workOrderList) { + int total = workOrderList.size(); + workOrderList.stream().filter(item -> { + return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType()); + }); + // TODO 鑷姩涓嬪彂宸ュ崟 + int real = workOrderList.size(); + boolean result = this.saveBatch(workOrderList); + log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}", total, real); + return result; } /** -- Gitblit v1.8.0