From cc441cd527704f86af13128213a1b3746c341b90 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期二, 12 三月 2024 09:07:00 +0800
Subject: [PATCH] 6 设备工具明细 功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 2 ++
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 1 -
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 1 +
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 1 +
cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java | 2 --
5 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index 26d3add..a07992d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -20,6 +20,7 @@
//鏇存柊
int upDeviceParameter(Device itemParameter);
+ //鑾峰彇琚巿鏉冧汉
List<Device> authorizedPerson();
//鏌ヨ
@@ -31,5 +32,6 @@
//鏌ヨ璁惧璐熻矗浜�
List<Device> selectDevicePrincipal();
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
index a5d0e97..9e4218b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java
@@ -135,11 +135,9 @@
@ApiModelProperty(value = "鐘舵��")
private Integer status;
- @ValueTableShow(27)
@ApiModelProperty(value = "鍥剧墖涓婁紶")
private String imageUpload;
- @ValueTableShow(28)
@ApiModelProperty(value = "鍥剧墖澶囨敞")
private String imageName;
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index e5740f4..7f8d103 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -118,7 +118,6 @@
id=#{id}
</where>
</update>
-
<select id="selectDeviceImage" resultType="com.yuanchu.mom.pojo.Device">
select (image_upload, create_user, create_time) values (#{image_upload}
, #{createUser}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 4481cb5..3850536 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -23,6 +23,7 @@
List<User> getUserMenu();
+ //鑾峰彇璁惧璐熻矗浜�
List<User> getDeviceManager();
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 3af627b..190030a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -69,6 +69,7 @@
return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
}
+ //鑾峰彇璁惧璐熻矗浜�
@Override
public List<User> getDeviceManager() {
return userMapper.getDeviceManager();
--
Gitblit v1.9.3