工单号生成策略调整

xiangpei

2024-08-24 25a4ed56eb70979a1d0cfdcc722264e687be9252

工单号生成策略调整

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

@@ -12,8 +12,6 @@
import com.ycl.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

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

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

@@ -69,7 +69,7 @@
        entity.setSerialNumber(form.getPointId());
        entity.setErrorType(String.join(",", form.getErrorType()));
        entity.setStatus(0);
        entity.setIdentify(IdUtils.timeAddRandomNO(3));
        entity.setIdentify(IdUtils.randomNO());
        Date now = new Date();
        entity.setCreateTime(now);
        entity.setUpdateTime(now);
@@ -108,7 +108,7 @@
            entity.setImportBatchNumber(String.valueOf(l));
            entity.setSerialNumber(item.getSerialNumber());
            entity.setStatus(0);
            entity.setIdentify(IdUtils.timeAddRandomNO(3));
            entity.setIdentify(IdUtils.randomNO());
            entity.setCreateTime(DateUtils.getNowDate());
            entity.setUpdateTime(DateUtils.getNowDate());
            reports.add(entity);

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

@@ -164,7 +164,7 @@
     */
    private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
        if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
            workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
            workOrder.setWorkOrderNo(IdUtils.randomNO());
        }
        if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
            workOrder.setErrorTypeList(new ArrayList<>());

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

@@ -28,10 +28,8 @@
import com.ycl.platform.wvp.WVPResult;
import com.ycl.system.Result;
import com.ycl.system.domain.SysConfig;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.mapper.SysDictDataMapper;
import com.ycl.system.mapper.SysDictTypeMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
@@ -183,7 +181,7 @@
                notAddList.add(workOrder);
                continue;
            }
            workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
            workOrder.setWorkOrderNo(IdUtils.randomNO());
            if (Objects.nonNull(point.getUnitId())) {
                workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
            }
@@ -236,7 +234,7 @@
    @Override
    public Result add(WorkOrderForm form) {
        WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
        entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
        entity.setWorkOrderNo(IdUtils.randomNO());
        entity.setCreateTime(DateUtils.getNowDate());
        entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
        Date now = new Date();

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

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

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

/**
 * ID生成器工具类
@@ -57,25 +55,10 @@
    /**
     * 获取当前时间+随机数的编号
     *
     * @param numberNum 时间后生成几位数字，默认5
     * @return 编号
     */
    public static String timeAddRandomNO(Integer numberNum)
    public static String randomNO()
    {
        if (numberNum == null || numberNum == 0 || numberNum < 3) {
            numberNum = 5;
        }

        Date now = new Date();
        String timeString = FORMAT.format(now);

        Random random = new Random();
        StringBuilder builder = new StringBuilder();
        builder.append(timeString);
        for (int i = 0; i < numberNum; i++) {
            // 生成一个0到9之间的随机数（包括0和9）
            builder.append(random.nextInt(10));
        }
        return builder.toString();
        return UUID.randomUUID().toString().replaceAll("-","").substring(0, 24);
    }
}