|
|
@ -74,9 +74,8 @@ public class SerialNumberServiceImpl implements SerialNumberService { |
|
|
|
|
|
|
|
private void validateSerialNumberNotExists(String ruleCode) { |
|
|
|
QueryWrapper<SerialNumberDO> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.eq("deleted", Boolean.FALSE); |
|
|
|
queryWrapper.eq("rule_code", ruleCode); |
|
|
|
if (serialNumberMapper.selectCount() != 0) { |
|
|
|
if (serialNumberMapper.selectCount(queryWrapper) != 0) { |
|
|
|
throw exception(SERIAL_NUMBER_EXISTS); |
|
|
|
} |
|
|
|
} |
|
|
@ -104,12 +103,11 @@ public class SerialNumberServiceImpl implements SerialNumberService { |
|
|
|
@Override |
|
|
|
public synchronized String generateCode(String ruleCode) { |
|
|
|
QueryWrapper<SerialNumberDO> queryWrapper = new QueryWrapper<>(); |
|
|
|
queryWrapper.isNull("delete_time"); |
|
|
|
queryWrapper.eq("rule_code", ruleCode); |
|
|
|
SerialNumberDO encodedRule = serialNumberMapper.selectOne(queryWrapper); |
|
|
|
String pattern = ""; |
|
|
|
if(encodedRule == null) { |
|
|
|
throw exception(RULE_CODE_NOT_EXISTS); |
|
|
|
throw exception(SERIAL_NUMBER_NOT_EXISTS); |
|
|
|
} |
|
|
|
if(encodedRule.getPattern() != null && !encodedRule.getPattern().equals("")) { |
|
|
|
LocalDate currentDate = LocalDate.now(); |
|
|
@ -138,7 +136,7 @@ public class SerialNumberServiceImpl implements SerialNumberService { |
|
|
|
if (incrementStr.length() <= encodedRule.getLength()) { |
|
|
|
sb.append(String.format("%0" + encodedRule.getLength() + "d", increment)); |
|
|
|
} else { |
|
|
|
throw exception(LENGTH_NOT_ENOUGH); |
|
|
|
throw exception(SERIAL_NUMBER_NOT_ENOUGH); |
|
|
|
} |
|
|
|
code = sb.toString(); |
|
|
|
} while (flag); |
|
|
|