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/resources/mapper/SensorMapper.xml |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/SensorMapper.xml b/screen-manage/src/main/resources/mapper/SensorMapper.xml
index 123dc80..2e147ef 100644
--- a/screen-manage/src/main/resources/mapper/SensorMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SensorMapper.xml
@@ -8,13 +8,16 @@
                     <result column="name" property="name" />
                     <result column="desc" property="desc" />
                     <result column="code" property="code" />
+                    <result column="upper" property="upper" />
+                    <result column="lower" property="lower" />
+                    <result column="default_unit_key" property="defaultUnitKey" />
                     <result column="create_time" property="createTime" />
                     <result column="update_time" property="updateTime" />
                     <result column="is_delete" property="isDelete" />
         </resultMap>
 
     <sql id="Base_Column_List">
-            s.id,s.name,s.code,s.desc,s.create_time,s.update_time,s.is_delete
+            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_unit_key,s.create_time,s.update_time,s.is_delete
     </sql>
 
     <insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -29,6 +32,15 @@
             <if test="desc != null">
                 `desc`,
             </if>
+            <if test="upper != null">
+                upper,
+            </if>
+            <if test="lower != null">
+                lower,
+            </if>
+            <if test="defaultUnitKey != null">
+                default_unit_key,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">
@@ -39,6 +51,15 @@
             </if>
             <if test="desc != null">
                 #{desc},
+            </if>
+            <if test="upper != null">
+                #{upper},
+            </if>
+            <if test="lower != null">
+                #{lower},
+            </if>
+            <if test="defaultUnitKey != null">
+                #{defaultUnitKey},
             </if>
         </trim>
     </insert>
@@ -63,6 +84,15 @@
             <if test="code != null">
                 code = #{code},
             </if>
+            <if test="upper != null">
+                upper = #{upper},
+            </if>
+            <if test="lower != null">
+                lower = #{lower},
+            </if>
+            <if test="default_unit_key != null">
+                default_unit_key = #{default_unit_key},
+            </if>
             <if test="isDelete != null">
                 is_delete = #{isDelete},
             </if>

--
Gitblit v1.8.0