From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 9568176..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
@@ -109,10 +109,16 @@
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);
+ wrapper.select(Device::getId, Device::getName, Device::getCode);
return deviceMapper.selectMaps(wrapper);
}
}
--
Gitblit v1.9.3