lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: 设备编码没有保存的问题

Browse Source
This commit is contained in:
lihongjie0209
2024-11-09 22:39:10 +08:00
parent c0a6951d4e
commit 3ca53957cb
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/cn/lihongjie/coal/device/service/DeviceService.java
View File

@@ -68,8 +68,7 @@ public class DeviceService extends BaseService<DeviceEntity, DeviceRepository> {
}
String genRule = StringUtils.defaultIfBlank(category.getDeviceCodeGenRule(), "3");
if (!StringUtils.equals(genRule, "3")
&& category.getCodeLength() == null) {
if (!StringUtils.equals(genRule, "3") && category.getCodeLength() == null) {
throw new BizException("设备类目编码长度不能为空");
}
StringBuilder sb = new StringBuilder();
@@ -104,11 +103,7 @@ public class DeviceService extends BaseService<DeviceEntity, DeviceRepository> {
sequenceService.createSequence(key, 0);
next = sequenceService.nextVal(key);
sb.append(
String.format(
"%0" + category.getCodeLength() + "d",
next));
sb.append(String.format("%0" + category.getCodeLength() + "d", next));
return StringUtils.defaultIfBlank(category.getCodePrefix(), "") + sb;
case "2":
@@ -123,11 +118,7 @@ public class DeviceService extends BaseService<DeviceEntity, DeviceRepository> {
sb.append(category.getCode());
sb.append(
String.format(
"%0" + category.getCodeLength() + "d",
next));
sb.append(String.format("%0" + category.getCodeLength() + "d", next));
return StringUtils.defaultIfBlank(category.getCodePrefix(), "") + sb;
@@ -149,7 +140,11 @@ public class DeviceService extends BaseService<DeviceEntity, DeviceRepository> {
}
this.mapper.updateEntity(entity, request);
entity.setCode(orgCode);
if (StringUtils.isNotEmpty(orgCode)) {
// 如果已经生成过编码，不再重新生成
entity.setCode(orgCode);
}
this.repository.save(entity);
return getById(entity.getId());