设备主页加房间名称

appapi/src/main/java/tech/glinfo/enbao/modules/sh/controller/ShDeviceController.java

@@ -322,7 +322,7 @@ public class ShDeviceController {
             return R.error("缺少参数");
         }
 
-        ShDeviceEntity device = otherShDeviceService.getById(deviceId);
+        Map<String, Object> device = otherShDeviceService.index(deviceId);
         ShDeviceDataEntity dataEntity = shDeviceDataService.getOne(new QueryWrapper<ShDeviceDataEntity>().eq("device_id", deviceId));
         Map<String, Object> map = new HashMap<>();
         map.put("device", device);

appapi/src/main/java/tech/glinfo/enbao/modules/sh/dao/OtherShDeviceDao.java

@@ -8,6 +8,7 @@ import tech.glinfo.enbao.modules.sh.entity.ShDeviceDataEntity;
 import tech.glinfo.enbao.modules.sh.entity.ShDeviceEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author linyetong
@@ -31,4 +32,9 @@ public interface OtherShDeviceDao extends BaseMapper<ShDeviceEntity> {
             " </script>")
     void deleteRelation(Integer id);
 
+
+    @Select("<script>" +
+            "SELECT a.id, a.numbering, a.numbering_flag numberingFlag, a.name, a.online_status onlineStatus, a.pic, a.spare_one spareOne, a.spare_two spareTwo, b.name roomName FROM sh_device a LEFT JOIN sh_family_room b ON a.room_id = b.id WHERE a.id = ${id}" +
+            " </script>")
+    Map<String, Object> index(Integer id);
 }

appapi/src/main/java/tech/glinfo/enbao/modules/sh/service/OtherShDeviceService.java

@@ -39,4 +39,5 @@ public interface OtherShDeviceService extends IService<ShDeviceEntity> {
 
     List<ShDeviceEntity> getDeviceByFlag(Integer userId);
 
+    Map<String, Object> index(Integer id);
 }

appapi/src/main/java/tech/glinfo/enbao/modules/sh/service/impl/OtherShDeviceServiceImpl.java

@@ -191,4 +191,9 @@ public class OtherShDeviceServiceImpl extends ServiceImpl<OtherShDeviceDao, ShDe
         return this.baseMapper.getDeviceByFlag(userId);
     }
 
+    @Override
+    public Map<String, Object> index(Integer id) {
+        return this.baseMapper.index(id);
+    }
+
 }