feat(增加大屏下设备查询所属机构信息): 增加大屏下设备查询所属机构信息

增加大屏下设备查询所属机构信息

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/bi/dto/MonitorTargetBiDTO.java

@@ -17,6 +17,9 @@ public class MonitorTargetBiDTO  {
      * 房间名
      */
     private String roomName;
+
+    private String createOrgName;
+    private String createOrg;
     /**
      * 状态（1：正常，2：闲置）
      */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/bi/service/BiService.java

@@ -29,11 +29,10 @@ import vip.xiaonuo.coldchain.modular.targetroom.service.TargetRoomService;
 import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.sys.modular.org.entity.SysOrg;
+import vip.xiaonuo.sys.modular.org.service.SysOrgService;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -53,6 +52,8 @@ public class BiService {
     @Resource
     private MonitorDeviceService monitorDeviceService;
 
+    @Resource
+    private SysOrgService sysOrgService;
 
 
 
@@ -128,7 +129,8 @@ public class BiService {
             TargetRoom targetRoom = targetRoomService.getById(monitorTarget.getRoomId());
             monitorTarget.setRoomName(targetRoom.getName());
             monitorTarget.setRegions(regionBiDTOS);
-            monitorTarget.setLastHeartbeatTime(monitorTarget.getLastHeartbeatTime());
+            SysOrg sysOrg = sysOrgService.getById(monitorTarget.getCreateOrg());
+            monitorTarget.setCreateOrgName(Optional.ofNullable(sysOrg).orElse(new SysOrg()).getName());
             //统计在线 离线 总数
             monitorTarget.setAllNum(regions.size());
             monitorTarget.setOnlineNum(onlineNum);