From c4c29d91cccfccf457594b87d09c0181f8810ba2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 25 三月 2024 11:18:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java
index 2db0a9a..b77ded9 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/DeviceController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
@@ -27,6 +28,8 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@PreAuthorize("hasAuthority('rcs:device:list')")
@PostMapping("/device/page")
@@ -55,6 +58,7 @@
if (!deviceService.save(device)) {
return R.error("娣诲姞澶辫触");
}
+ device.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
return R.ok("娣诲姞鎴愬姛");
}
--
Gitblit v1.9.1