独立拆出老人机项目

src/main/resources/mapper/DeviceMapping.xml

@@ -9,8 +9,6 @@
             t1.createTime,
             t1.status,
             t1.`name`,
-            t3.`name`           AS `group`,
-            t4.`name`           AS item,
             t2.deviceId,
             t2.`mode`,
             t2.lon,
@@ -26,8 +24,6 @@
         FROM
             zy_device t1
         LEFT JOIN latest_location t2 ON t1.clientId = t2.deviceId
-        LEFT JOIN `item_group` t3 ON t1.groupId = t3.id
-        LEFT JOIN item t4 ON t3.itemId = t4.id
         <where>
             <if test="io.num != null and io.num != ''">
                 AND (t1.num LIKE CONCAT("%",#{io.num},"%") OR t1.clientId LIKE CONCAT("%",#{io.num},"%"))
@@ -35,12 +31,6 @@
             <if test="io.status != null and io.status > -1">
                 AND t1.status = #{io.status}
             </if>
-            <if test="io.group != null and io.group > -1">
-                AND t1.groupId = #{io.groupId}
-            </if>
-            <if test="io.item != null and io.item > -1">
-                AND t4.id = #{io.item}
-            </if>
         </where>
         ORDER BY
             t1.createTime DESC
@@ -63,6 +53,7 @@
         </foreach>
         END,
         `lastOnlineTime` = CASE clientId
+        WHEN '0' THEN '0'
         <foreach collection="devices" item="device">
             <if test="device.status == 1">
                 WHEN #{device.clientId} THEN #{device.lastOnlineTime}