Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-08 01a30369e55a754c28dec4939a99e59aefecdc60

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -8,14 +8,13 @@
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.query.ScreenQuery;
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.query.*;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
@@ -33,6 +32,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 +52,7 @@
 * @author xp
 * @since 2024-03-05
 */
@Slf4j
@Service
@RequiredArgsConstructor
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
@@ -72,20 +73,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;
    }

    /**
@@ -467,4 +464,14 @@
        dataMap.put("pending", data3);
        return dataMap;
    }

    @Override
    public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
        return baseMapper.workOrderTotal(dashboardQuery);
    }

    @Override
    public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
        return baseMapper.workOrderRegion(dashboardQuery);
    }
}