工单号生成策略修改

xiangpei

2024-09-02 e0897449eabdeddcadee9104ca15f1c829354ee3

工单号生成策略修改

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

@@ -48,7 +48,7 @@
            throw new RuntimeException("列名称不能重复");
        }
        DynamicColumn entity = DynamicColumnForm.getEntityByForm(form, null);
        entity.setPropName(IdUtils.randomNO());
        entity.setPropName(IdUtils.randomNO(new Date()));
        entity.setCreateTime(new Date());
        entity.setTableName(TABLE_NAME);
        baseMapper.insert(entity);

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

@@ -88,10 +88,10 @@
        Report entity = ReportForm.getEntityByForm(form, null);
        entity.setSerialNumber(point.getSerialNumber());
        entity.setStatus(0);
        entity.setIdentify(IdUtils.randomNO());
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        entity.setIdentify(IdUtils.randomNO(now));
        baseMapper.insert(entity);
        List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(item -> {
            ReportErrorType reportErrorType = new ReportErrorType();
@@ -125,8 +125,9 @@
        // 读取excel数据
        ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
        List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
        Date now = DateUtils.getNowDate();
        // 批量插入
        String pid = IdUtils.randomNO();
        String pid = IdUtils.randomNO(now);
        Integer success = 0;
        for (ReportImportDTO item : list) {
            if ("事前报备".equals(form.getReportType())) {
@@ -146,8 +147,7 @@
            entity.setImportBatchNumber(pid);
            entity.setSerialNumber(item.getSerialNumber());
            entity.setStatus(0);
            entity.setIdentify(IdUtils.randomNO());
            Date now = DateUtils.getNowDate();
            entity.setIdentify(IdUtils.randomNO(now));
            entity.setCreateTime(now);
            entity.setUpdateTime(now);
            baseMapper.insert(entity);

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

@@ -8,12 +8,14 @@
import constant.ApiConstants;
import enumeration.ErrorType;
import enumeration.general.WorkOrderStatusEnum;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -131,6 +133,7 @@

    @Override
    public void osdCheck(List<OsdCheckResult> dataList) {
        Date now = new Date();
        List<WorkOrder> workOrderList = dataList.stream().map(item -> {
            WorkOrder workOrder = new WorkOrder();
            // osd时间
@@ -158,9 +161,6 @@
     * @param serialNumber 国标码
     */
    private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
        if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
            workOrder.setWorkOrderNo(IdUtils.randomNO());
        }
        if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
            workOrder.setErrorTypeList(new ArrayList<>());
            workOrder.getErrorTypeList().add(errorType.getValue());

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

@@ -211,7 +211,7 @@
                notAddList.add(workOrder);
                continue;
            }
            workOrder.setWorkOrderNo(IdUtils.randomNO());
            workOrder.setWorkOrderNo(IdUtils.randomNO(now));
            if (Objects.nonNull(point.getUnitId())) {
                workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
            }
@@ -268,12 +268,12 @@
    @Override
    public Result add(WorkOrderForm form) {
        WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
        entity.setWorkOrderNo(IdUtils.randomNO());
        entity.setCreateTime(DateUtils.getNowDate());
        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
        entity.setWorkOrderNo(IdUtils.randomNO(now));
        entity.setErrorType(String.join(",", form.getErrorType()));
        List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
        workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);

 ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java

@@ -1,6 +1,7 @@
package com.ycl.utils.uuid;

import java.text.SimpleDateFormat;
import java.util.Date;

/**
 * ID生成器工具类
@@ -11,6 +12,7 @@
{

    private final static SimpleDateFormat FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
    private final static SimpleDateFormat DAY_FORMAT = new SimpleDateFormat("yyyyMMdd");

    /**
     * 获取随机UUID
@@ -57,8 +59,8 @@
     *
     * @return 编号
     */
    public static String randomNO()
    public static String randomNO(Date now)
    {
        return UUID.randomUUID().toString().replaceAll("-","").substring(0, 24);
        return DAY_FORMAT.format(now) + UUID.randomUUID().toString().replaceAll("-","").substring(0, 18);
    }
}