From 25a4ed56eb70979a1d0cfdcc722264e687be9252 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 24 八月 2024 15:23:37 +0800 Subject: [PATCH] 工单号生成策略调整 --- ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 2 +- ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java | 4 +--- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 6 ++---- ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java | 21 ++------------------- ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 4 ++-- 5 files changed, 8 insertions(+), 29 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java index 0097473..7d64e05 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DynamicColumnServiceImpl.java +++ b/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); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java index 1f80460..5e70608 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java +++ b/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); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java index da0bd99..78fd917 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java +++ b/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<>()); 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 fc7760c..7b5fac5 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 @@ -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(); diff --git a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java b/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java index eaf4e6b..40a6840 100644 --- a/ycl-server/src/main/java/com/ycl/utils/uuid/IdUtils.java +++ b/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); } } -- Gitblit v1.8.0