MYSQL修改

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dto/ShDeviceIndex.java

@@ -17,5 +17,7 @@ public class ShDeviceIndex {
 
     private Integer onlineStatus;
 
+    private Integer roomId;
+
     private String pic;
 }

appapi/src/main/resources/mapper/sh/OtherShFamilyDao.xml

@@ -22,6 +22,7 @@
             <result column="name" property="name"/>
             <result column="numbering" property="numbering"/>
             <result column="onlineStatus" property="onlineStatus"/>
+            <result column="room_id" property="roomId"/>
             <result column="pic" property="pic"/>
         </collection>
         <collection property="rooms" ofType="tech.glinfo.enbao.modules.sh.dto.ShFamilyRoomIndex" columnPrefix="room_">
@@ -31,12 +32,12 @@
     </resultMap>
 
     <select id="familyInfo" resultMap="familyResultMap">
-        SELECT a.id, a.name, COUNT(c.id) room,
+        SELECT a.id, a.name, (SELECT COUNT(c.id) FROM sh_family_room c WHERE a.id = c.family_id) room,
             b.id item_id,
             d.nickname item_nickname,
             b.is_admin item_is_admin
         FROM
-            sh_family a left join sh_family_room c on a.id = c.family_id, sh_family_member b, app_user d
+            sh_family a , sh_family_member b, app_user d
         WHERE
             a.id = b.family_id AND b.user_id = d.id AND a.id = ${id}
     </select>
@@ -47,6 +48,7 @@
             b.name device_name,
             b.numbering device_numbering,
             b.online_status device_onlineStatus,
+            b.room_id device_room_id,
             b.pic device_pic,
             c.id room_id,
             c.name room_name