feat(ymt): 生成监码时支持自定义起始序列号

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -273,6 +273,11 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     private ESElavtorRepository esElavtorRepository;
     @Value("${regulator.unit.code}")
     private String code;
+
+    // 仅测试时使用该起始序列号，默认为空。正式环境不配置该属性时使用枚举里的值
+    @Value("${ymt.createCode.96333.startCode:}")
+    private String startCode;
+
     @Autowired
     private RedisUtils redisUtils;
     // 一码通checkCode中redis key过期时间
@@ -718,7 +723,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             }
             log.info("生成码成功");
             SupervisoryCodeInfo supervisoryCodeInfo = new SupervisoryCodeInfo();
-            SupervisoryCodeInfo selectOne = supervisoryCodeInfoMapper.selectOne(new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisionCode));
+            SupervisoryCodeInfo selectOne = supervisoryCodeInfoMapper.selectOne(new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisorCode.toString()));
             // 将生成的码添加到码表中，码的使用状态为初始状态
             String equState = EquipmentCategoryEnum.CSZT.getCode();
             supervisoryCodeInfo.setCode96333(String.valueOf(elevatorCode));
@@ -882,7 +887,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             if (!ObjectUtils.isEmpty(elevatorOtherInfo) && elevatorOtherInfo.getCode() != null) {
                 StopWatch stopWatch = new StopWatch();
                 stopWatch.start();
-                Integer start = Integer.valueOf(prefix + EquipmentCategoryEnum.getCode.get(prefix));
+                Integer start = Integer.valueOf(prefix + (ValidationUtil.isEmpty(startCode) ? EquipmentCategoryEnum.getCode.get(prefix) : startCode));
                 Integer end = Integer.valueOf(elevatorOtherInfo.getCode());
 //                List<Integer> allCodeList = IntStream.rangeClosed(start, end)
 //                        .boxed()

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/GenerateCodeServiceImpl.java

@@ -35,6 +35,8 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
     private static final String LOCK_KEY_SUPERVISORY = "sequence_lock_supervisory";
     private static final String SEQUENCE_TYPE_UR = "%05d";
     private static final String SEQUENCE_TYPE = "%08d";
+
+    private static final String SUPERVISOR_SEQUENCE_TYPE = "%07d";
     private final RedisTemplate<String, String> redisTemplate;
     private final StringRedisTemplate stringRedisTemplate;
     private final CategoryOtherInfoMapper categoryOtherInfoMapper;
@@ -128,7 +130,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
                 log.info("===================>获取《{}》当前顺序码：{}<===================", sequenceKey, currentSequenceStr);
                 currentSequence++;
                 // 生成顺序码
-                String formattedSequence = String.format(GenerateCodeServiceImpl.SEQUENCE_TYPE, currentSequence);
+                String formattedSequence = String.format(GenerateCodeServiceImpl.SUPERVISOR_SEQUENCE_TYPE, currentSequence);
                 log.info("===================>更新《{}》顺序码：{}<===================", sequenceKey, formattedSequence);
                 // 更新顺序码
                 valueOps.set(sequenceKey, formattedSequence);