From 45e8ce118789aad77ba75b24b9455041d8a8d57c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:03 +0800
Subject: [PATCH] MOM系统-8-29
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index a889152..4d21f86 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -95,14 +95,30 @@
}
@Override
- public Integer deviceDeleteIdOrFather(Integer id, String deviceFather) {
+ public Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather) {
LambdaUpdateWrapper<Device> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(Device::getState, 0);
- if (id != null) {
+ if (id == null && deviceFather == null) {
+ return 0;
+ } else if (id != null) {
updateWrapper.eq(Device::getId, id);
} else if (deviceFather != null) {
+ updateWrapper.eq(Device::getType, type);
updateWrapper.eq(Device::getFather, deviceFather);
}
return deviceMapper.update(new Device(), updateWrapper);
}
+
+ //鏍规嵁鍒嗙粍鏌ヨ璁惧鍚�
+ @Override
+ public List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup) {
+ return deviceMapper.getDeviceNameByGroup(deviceGroup);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectDeviceIdAndName() {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Device::getId, Device::getName, Device::getCode);
+ return deviceMapper.selectMaps(wrapper);
+ }
}
--
Gitblit v1.9.3