'优化会议室表-会议室下拉框信息和会议室预约情况列表两个接口，新增域名判断字段，在没有登录状态下，通过域名获取租户id，然后查询会议相关信息'

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -58,9 +58,9 @@ public class MeetingRoomController {
      * 会议室下拉框信息
      * @return
      */
-    @PostMapping("MeetingRoomList")
-    public ApiResult<List<MeetingRoom>> MeetingRoomList(){
-        return ApiResult.success(meetingRoomService.MeetingRoomList());
+    @GetMapping("MeetingRoomList")
+    public ApiResult<List<MeetingRoom>> MeetingRoomList(@RequestParam(value = "domain",required = false) String domain){
+        return ApiResult.success(meetingRoomService.MeetingRoomList(domain));
     }
 
     /**

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/repository/MeetingRoomRepository.java

@@ -115,6 +115,9 @@ public interface MeetingRoomRepository extends JpaRepository<MeetingRoom, Long>,
 
     @Query(value = "select * from meeting_room where floor_id = :floorId",nativeQuery = true)
     List<MeetingRoom> getMeetingRoomList(@Param("floorId") Long floorId);
+
+    @Query(value = "select id from sys_tenant where domain = :domain",nativeQuery = true)
+    Integer getTenantIdByDomain(@Param("domain") String domain);
 //
 //    /**
 //     * 会议室列表(运营)

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingRoomService.java

@@ -28,7 +28,7 @@ public interface MeetingRoomService extends CrudService<MeetingRoom> {
 
     CommonPage<MeetingRoom> dmMeetingRoomList(MeetingRoomRequestVO requestVO);
 
-    List<MeetingRoom> MeetingRoomList();
+    List<MeetingRoom> MeetingRoomList(String domain);
 
     void add(MeetingRoom meetingRoom);
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -152,9 +152,15 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public List<MeetingRoom> MeetingRoomList() {
+    public List<MeetingRoom> MeetingRoomList(String domain) {
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
+        if(StringUtils.isNotBlank(domain)){
+            Integer tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+            queryWrapper.eq(MeetingRoom::getTenantId, tenantId);
+        }else{
+            queryWrapper.eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
+        }
+
         List<MeetingRoom> list = this.list(queryWrapper);
 
         return list;
@@ -224,10 +230,19 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         List<DmMeetingRoomDto> newDmMeetingRoomDtoList = new ArrayList<>();
         String meetingRoomName = reservationVO.getMeetingRoomName();
         Long meetingRoomId = reservationVO.getMeetingRoomId();
+        String domain = reservationVO.getDomain();
+        Integer tenantId;
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
+
+
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(meetingRoomId != null,MeetingRoom::getRoomId,reservationVO.getMeetingRoomId())
                 .like(StringUtils.isNotBlank(meetingRoomName),MeetingRoom::getRoomName,meetingRoomName)
-                .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId());
+                .eq(MeetingRoom::getTenantId,tenantId);
         List<MeetingRoom> list1 = this.list(queryWrapper);
         List<Long> floorIdList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list1)) {
@@ -238,7 +253,7 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
             }
             LambdaQueryWrapper<MeetingFloor> floorWrapper = Wrappers.lambdaQuery();
             floorWrapper.in(MeetingFloor::getFloorId, floorIdList)
-                    .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
+                    .eq(MeetingFloor::getTenantId, tenantId);
             List<MeetingFloor> meetingFloorList = dmFloorService.list(floorWrapper);
             if (CollectionUtils.isNotEmpty(meetingFloorList)) {
                 for (int i = 0; i < list1.size(); i++) {

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/MeetingRoomReservationVO.java

@@ -22,4 +22,9 @@ public class MeetingRoomReservationVO {
      * 会议预约日期
      */
     private String date;
+
+    /**
+     * 域名
+     */
+    private String domain;
 }