From 342394b7b0d64c8d8329ed5e46b840c04572b1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Thu, 14 Jul 2022 17:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EMac=20=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=20=20=E9=80=9A=E8=BF=87id=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/storeroom/utils/MacUtil.java | 29 +++++++++++++++++++ common/src/test/java/TestMacAddress.java | 17 +++++++++++ .../modules/device/service/DeviceService.java | 20 ++++++++++++- .../device/service/impl/DeviceImpl.java | 9 ++++++ .../service/impl/DeviceSpecParamImpl.java | 2 ++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/com/storeroom/utils/MacUtil.java create mode 100644 common/src/test/java/TestMacAddress.java diff --git a/common/src/main/java/com/storeroom/utils/MacUtil.java b/common/src/main/java/com/storeroom/utils/MacUtil.java new file mode 100644 index 0000000..b85f09c --- /dev/null +++ b/common/src/main/java/com/storeroom/utils/MacUtil.java @@ -0,0 +1,29 @@ +package com.storeroom.utils; + + +import java.net.InetAddress; +import java.net.NetworkInterface; + +public final class MacUtil { + + + + /** + * 根据不同操作系统执行不同命令 + * 获取本机 mac 地址集合 + * + * @return mac 地址集合 + */ + public static String getMac() throws Exception { + + InetAddress ip = InetAddress.getLocalHost(); + NetworkInterface network = NetworkInterface.getByInetAddress(ip); + byte[] mac = network.getHardwareAddress(); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < mac.length; i++) { + sb.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : "")); + } + + return sb.toString(); + } +} diff --git a/common/src/test/java/TestMacAddress.java b/common/src/test/java/TestMacAddress.java new file mode 100644 index 0000000..795951c --- /dev/null +++ b/common/src/test/java/TestMacAddress.java @@ -0,0 +1,17 @@ +import com.storeroom.utils.MacUtil; +import org.junit.jupiter.api.Test; + + + +public class TestMacAddress { + + + @Test + public void getMac(){ + try { + System.out.println(MacUtil.getMac()); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java index f934493..df55d62 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java @@ -15,6 +15,7 @@ public interface DeviceService { /** * 新增密集架 + * * @param deviceInfoDto / */ void createDeseCabinet(DeviceInfoDto deviceInfoDto); @@ -22,18 +23,21 @@ public interface DeviceService { /** * 修改密集架 + * * @param deviceInfoDto / */ void updateDeseCabinet(DeviceInfoDto deviceInfoDto); /** * 新增回转柜 + * * @param deviceInfoDto */ void createRotaryCabinet(DeviceInfoDto deviceInfoDto); /** * 修改回转柜 + * * @param deviceInfoDto / */ void updateRotaryCabinet(DeviceInfoDto deviceInfoDto); @@ -41,6 +45,7 @@ public interface DeviceService { /** * 创建摄像头 + * * @param deviceInfoDto / */ void createCamera(DeviceInfoDto deviceInfoDto); @@ -48,6 +53,7 @@ public interface DeviceService { /** * 修改摄像头 + * * @param deviceInfoDto */ void updateCamera(DeviceInfoDto deviceInfoDto); @@ -55,12 +61,14 @@ public interface DeviceService { /** * 新增 空调、桌面式RFID读写器、盘点机、恒湿机、漏水传感器、温湿度感应器、 空气质监测、漏水传感器设备 + * * @param deviceInfoDto */ void createInsideDevices(DeviceInfoDto deviceInfoDto); /** * 修改 空调、桌面式RFID读写器、盘点机、恒湿机、漏水传感器、温湿度感应器、 空气质监测、漏水传感器设备 + * * @param deviceInfoDto */ void updateInsideDevices(DeviceInfoDto deviceInfoDto); @@ -68,15 +76,25 @@ public interface DeviceService { /** * 新增 通道门，手持RFID读写器 + * * @param deviceInfoDto / */ void createOutsideDevices(DeviceInfoDto deviceInfoDto); /** - * 修改 通道门，手持RFID读写器 + * 修改 通道门，手持RFID读写器 + * * @param deviceInfoDto / */ void updateOutsideDevices(DeviceInfoDto deviceInfoDto); + /** + * 根据id 查询设备信息 + * + * @param id + * @return + */ + DeviceInfoDto findById(String id); + } diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index e3e988b..fa4f591 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -271,6 +271,15 @@ public class DeviceImpl implements DeviceService { deviceInfoRepository.save(deviceInfo1); } + @Override + public DeviceInfoDto findById(String id) { + if (StringUtils.isEmpty(id)){ + throw new BaseException("id不能为空"); + } + DeviceInfo deviceInfo=deviceInfoRepository.findById(id).orElseGet(DeviceInfo::new); + return deviceInfoMapper.toDto(deviceInfo); + } + /** * 生成架位左右位置 * diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java index f711343..9ff5bcb 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java @@ -5,6 +5,7 @@ import com.storeroom.modules.device.repository.DeviceSpecParamRepository; import com.storeroom.modules.device.service.DeviceSpecParamService; import com.storeroom.modules.device.service.dto.DeviceSpecParamDto; import com.storeroom.modules.device.service.mapstruct.DeviceSpecParamMapper; +import com.storeroom.utils.MacUtil; import com.storeroom.utils.NanoIdUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -38,6 +39,7 @@ public class DeviceSpecParamImpl implements DeviceSpecParamService { @Override public void delete(String id) { + deviceSpecParamRepository.deleteById(id); }