From ec12ec5a72d2f357a9f5dc9db7044b9469513f0d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 13:07:04 +0800
Subject: [PATCH] 因子默认单位添加；角色、菜单更新
---
screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java | 8 ++------
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 14 +++++++++++++-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
index b409e79..1632882 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java
@@ -198,9 +198,7 @@
wrapper_VSU.eq("is_delete",0);
wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
wrapper_VSU.eq("dict_type_id",14);
- Map<String,Object> defaultUnitMap = new HashMap<>();
- defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
- sensorMap.put("default_unit_key",defaultUnitMap);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
@@ -282,9 +280,7 @@
wrapper_VSU.eq("is_delete",0);
wrapper_VSU.eq("dataKey",sensor.getDefaultUnitKey());
wrapper_VSU.eq("dict_type_id",14);
- Map<String,Object> defaultUnitMap = new HashMap<>();
- defaultUnitMap.put(sensor.getDefaultUnitKey(),sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
- sensorMap.put("default_unit_key",defaultUnitMap);
+ sensorMap.put("default_unit_key",sysDictDataMapper.selectOne(wrapper_VSU).getDataValue());
}
sensorList.add(sensorMap);
}
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 56e6c5d..64a0bd7 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -18,7 +18,7 @@
<sql id="Base_Column_List">
- mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
+ mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
</sql>
@@ -74,6 +74,9 @@
<if test="order != null">
`order`,
</if>
+ <if test="desc != null">
+ `desc`,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">
@@ -90,6 +93,9 @@
</if>
<if test="order != null">
#{order},
+ </if>
+ <if test="desc != null">
+ #{desc},
</if>
</trim>
</insert>
@@ -114,6 +120,9 @@
</if>
<if test="is_delete != null">
is_delete = #{is_delete},
+ </if>
+ <if test="desc != null">
+ `desc` = #{desc},
</if>
</set>
where id = #{id}
@@ -175,6 +184,9 @@
<if test="order != null">
and mm.order = #{order}
</if>
+ <if test="desc != null">
+ and mm.desc = #{order}
+ </if>
limit #{start},#{number}
</select>
--
Gitblit v1.8.0