From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 2 --
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java | 6 ++++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
index a84cdc8..933bcea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -72,8 +72,6 @@
station.setContainerTypes(longs1);
}
-
-
return R.ok().add(station);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
index 6977f0b..c13f3ed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/InitContainerParams.java
@@ -16,7 +16,7 @@
private Integer endNo;
@ApiModelProperty("瀹瑰櫒绫诲瀷")
- private Long containerType;
+ private Long containerType = 3L;
@ApiModelProperty("闀垮害")
private Integer length = 6;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
index b2c69ed..c0cd7b3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasContainerServiceImpl.java
@@ -58,7 +58,9 @@
for (int i = params.getStartNo(); i <= params.getEndNo() ; i++) {
BasContainer container = new BasContainer();
String code = StringUtils.leftPad(i + "", params.getLength(), "0");
-
+ if (!params.getContainerType().equals(3L)) {
+ params.setPrefix("81");
+ }
container.setAreas(areas.getName())
.setCodeType(QRCodeType.QRCODE_TYPE_BARCODE.desc)
.setCode(params.getPrefix() + code)
@@ -74,6 +76,6 @@
throw new CoolException("瀹瑰櫒淇濆瓨澶辫触,璇锋鏌ョ紪鐮佹槸鍚︽湁閲嶅锛侊紒");
}
- return R.ok();
+ return R.ok("鏂板鎴愬姛锛侊紒").add(containerList);
}
}
--
Gitblit v1.9.1