Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

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

@@ -66,62 +66,62 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     private SysUserService sysUserService;
 
     @Override
-    public Map<String,Object> FirstPageStatistic(String year){
-        Map<String,Object> map = new HashMap<>();
+    public Map<String, Object> FirstPageStatistic(String year) {
+        Map<String, Object> map = new HashMap<>();
         Integer tenantId = SecurityUtils.getTenantId();
-        Map<String,Object> roomSummary = dmMeetingRoomRepository.roomSummary(tenantId);
-        map.put("roomSummary",roomSummary);
-        Map<String,Object> meetingSummary = dmMeetingService.meetingSummary(tenantId);
-        map.put("meetingSummary",meetingSummary);
-        Map<String,Object> meetingSummaryByYear = dmMeetingService.meetingSummaryByYear(year,tenantId);
-        map.put("meetingSummaryByYear",meetingSummaryByYear);
+        Map<String, Object> roomSummary = dmMeetingRoomRepository.roomSummary(tenantId);
+        map.put("roomSummary", roomSummary);
+        Map<String, Object> meetingSummary = dmMeetingService.meetingSummary(tenantId);
+        map.put("meetingSummary", meetingSummary);
+        Map<String, Object> meetingSummaryByYear = dmMeetingService.meetingSummaryByYear(year, tenantId);
+        map.put("meetingSummaryByYear", meetingSummaryByYear);
 
         return map;
     }
 
     @Override
-    public CommonPage<MeetingRoom> dmMeetingRoomList(MeetingRoomRequestVO requestVO){
-        IPage<MeetingRoom> page = new Page<>(requestVO.getCurrent(),requestVO.getSize());
+    public CommonPage<MeetingRoom> dmMeetingRoomList(MeetingRoomRequestVO requestVO) {
+        IPage<MeetingRoom> page = new Page<>(requestVO.getCurrent(), requestVO.getSize());
 
-        String floorId = null ;
-        if(StringUtils.isNotBlank(requestVO.getFloorName())){
+        String floorId = null;
+        if (StringUtils.isNotBlank(requestVO.getFloorName())) {
             QueryWrapper<MeetingFloor> query = Wrappers.query();
-            query.select("floor_id").eq("floor_name",requestVO.getFloorName())
-                    .eq("tenant_id",SecurityUtils.getTenantId());
-            List<Map<String,Object>> map = dmFloorService.listMaps(query);
-            if(CollectionUtils.isNotEmpty(map)){
+            query.select("floor_id").eq("floor_name", requestVO.getFloorName())
+                    .eq("tenant_id", SecurityUtils.getTenantId());
+            List<Map<String, Object>> map = dmFloorService.listMaps(query);
+            if (CollectionUtils.isNotEmpty(map)) {
                 floorId = map.get(0).get("floor_id").toString();
             }
         }
 
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()),MeetingRoom::getRoomName,requestVO.getRoomName())
-                .eq(StringUtils.isNotBlank(floorId),MeetingRoom::getFloorId,floorId)
-                .eq(null != requestVO.getStatus(),MeetingRoom::getStatus,requestVO.getStatus())
-                .eq(null != requestVO.getRoomStatus(),MeetingRoom::getRoomStatus,requestVO.getRoomStatus())
+        queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
+                .eq(StringUtils.isNotBlank(floorId), MeetingRoom::getFloorId, floorId)
+                .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
+                .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
                 .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
                 .orderByDesc(MeetingRoom::getRoomId);
-        page = this.page(page,queryWrapper);
-        if(CollectionUtils.isNotEmpty(page.getRecords())){
+        page = this.page(page, queryWrapper);
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
             //查询楼层信息和本地存储信息
             List<Long> floorIdList = new ArrayList<>();
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Long floorId1 = page.getRecords().get(i).getFloorId();
-                if(!floorIdList.contains(floorId1)){
+                if (!floorIdList.contains(floorId1)) {
                     floorIdList.add(floorId1);
                 }
             }
             LambdaQueryWrapper<MeetingFloor> floorQuery = Wrappers.lambdaQuery();
-            floorQuery.in(CollectionUtils.isNotEmpty(floorIdList), MeetingFloor::getFloorId,floorIdList)
-                    .eq(MeetingFloor::getTenantId,SecurityUtils.getTenantId());
+            floorQuery.in(CollectionUtils.isNotEmpty(floorIdList), MeetingFloor::getFloorId, floorIdList)
+                    .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
             List<MeetingFloor> floorList = dmFloorService.list(floorQuery);
 
             //会议室匹配对应楼层信息和本地存储信息
             for (int i = 0; i < page.getRecords().size(); i++) {
-                if(CollectionUtils.isNotEmpty(floorList)){
+                if (CollectionUtils.isNotEmpty(floorList)) {
                     Long frId = Long.valueOf(page.getRecords().get(i).getFloorId());
                     for (int j = 0; j < floorList.size(); j++) {
-                        if(frId.equals(floorList.get(j).getFloorId())){
+                        if (frId.equals(floorList.get(j).getFloorId())) {
                             page.getRecords().get(i).setMeetingFloor(floorList.get(j));
                             break;
                         }
@@ -131,11 +131,11 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         }
 
 
-        return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getSize(),requestVO.getCurrent());
+        return new CommonPage<>(page.getRecords(), page.getTotal(), requestVO.getSize(), requestVO.getCurrent());
     }
 
     @Override
-    public List<MeetingRoom> MeetingRoomList(){
+    public List<MeetingRoom> MeetingRoomList() {
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
         List<MeetingRoom> list = this.list(queryWrapper);
@@ -144,9 +144,9 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public void add(MeetingRoom meetingRoom){
-        if(checkNameUnique(meetingRoom)){
-            throw new BusinessException("新增会议室房间失败，"+meetingRoom.getRoomName()+"已经存在");
+    public void add(MeetingRoom meetingRoom) {
+        if (checkNameUnique(meetingRoom)) {
+            throw new BusinessException("新增会议室房间失败，" + meetingRoom.getRoomName() + "已经存在");
         }
         meetingRoom.setRoomStatus(0);
         meetingRoom.setReserveStatus(0);
@@ -158,9 +158,9 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public void edit(MeetingRoom meetingRoom){
-        if(checkNameUnique(meetingRoom)){
-            throw new BusinessException("修改会议室房间失败，"+meetingRoom.getRoomName()+"已经存在");
+    public void edit(MeetingRoom meetingRoom) {
+        if (checkNameUnique(meetingRoom)) {
+            throw new BusinessException("修改会议室房间失败，" + meetingRoom.getRoomName() + "已经存在");
         }
         meetingRoom.setUpdateBy(SecurityUtils.getUsername());
         meetingRoom.setUpdateTime(LocalDateTime.now());
@@ -169,13 +169,13 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public void remove(Long roomId){
+    public void remove(Long roomId) {
         List<MeetingDevice> deviceList = meetingDeviceRepository.getDeviceListByRoomId(roomId);
-        if(deviceList.size() > 0){
+        if (deviceList.size() > 0) {
             throw new BusinessException("会议室有绑定设备，不可删除");
         }
         List<MeetingInfo> meetingList = meetingInfoRepository.queryAllMeetingByRoomId(roomId);
-        if(meetingList.size() > 0){
+        if (meetingList.size() > 0) {
             throw new BusinessException("有会议记录不可删除");
         }
 
@@ -186,46 +186,46 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public Map<String,Object> attendee(Long meetingId, Long userId, String userName){
+    public Map<String, Object> attendee(Long meetingId, Long userId, String userName) {
         Map<String, Object> map = new HashMap<>();
         Integer tenantId = SecurityUtils.getTenantId();
-        map.put("userName",userName);
-        List<MeetingAttendee> list = meetingAttendeeRepository.findMeetingAttendeeList(meetingId,userId,tenantId);
-        if(org.springframework.util.CollectionUtils.isEmpty(list)){
-            map.put("msg","您当前没有需要参加的会议");
-        }else{
-            map.put("msg","验证成功");
+        map.put("userName", userName);
+        List<MeetingAttendee> list = meetingAttendeeRepository.findMeetingAttendeeList(meetingId, userId, tenantId);
+        if (org.springframework.util.CollectionUtils.isEmpty(list)) {
+            map.put("msg", "您当前没有需要参加的会议");
+        } else {
+            map.put("msg", "验证成功");
         }
         return map;
     }
 
     @Override
-    public List<DmMeetingRoomDto> getMeetingRoomReservationList(MeetingRoomReservationVO reservationVO)  throws ParseException {
+    public List<DmMeetingRoomDto> getMeetingRoomReservationList(MeetingRoomReservationVO reservationVO) throws ParseException {
         List<DmMeetingRoomDto> list = new ArrayList<>();
         List<DmMeetingRoomDto> newDmMeetingRoomDtoList = new ArrayList<>();
-        String meetingRoomName = reservationVO.getMeetingRoomName();
+        Long meetingRoomId = reservationVO.getMeetingRoomId();
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(meetingRoomName),MeetingRoom::getRoomName,meetingRoomName)
-                .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId());
+        queryWrapper.eq(meetingRoomId != null, MeetingRoom::getRoomId, meetingRoomId)
+                .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
         List<MeetingRoom> list1 = this.list(queryWrapper);
         List<Long> floorIdList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(list1)){
+        if (CollectionUtils.isNotEmpty(list1)) {
             for (int i = 0; i < list1.size(); i++) {
-                if(!floorIdList.contains(list1.get(i).getFloorId())){
+                if (!floorIdList.contains(list1.get(i).getFloorId())) {
                     floorIdList.add(list1.get(i).getFloorId());
                 }
             }
             LambdaQueryWrapper<MeetingFloor> floorWrapper = Wrappers.lambdaQuery();
-            floorWrapper.in(MeetingFloor::getFloorId,floorIdList)
-                    .eq(MeetingFloor::getTenantId,SecurityUtils.getTenantId());
+            floorWrapper.in(MeetingFloor::getFloorId, floorIdList)
+                    .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
             List<MeetingFloor> meetingFloorList = dmFloorService.list(floorWrapper);
-            if(CollectionUtils.isNotEmpty(meetingFloorList)){
+            if (CollectionUtils.isNotEmpty(meetingFloorList)) {
                 for (int i = 0; i < list1.size(); i++) {
                     DmMeetingRoomDto dmMeetingRoomDto = new DmMeetingRoomDto();
                     dmMeetingRoomDto.setRoomId(list1.get(i).getRoomId());
                     dmMeetingRoomDto.setRoomName(list1.get(i).getRoomName());
                     for (int j = 0; j < meetingFloorList.size(); j++) {
-                        if(list1.get(i).getFloorId().equals(meetingFloorList.get(j).getFloorId())){
+                        if (list1.get(i).getFloorId().equals(meetingFloorList.get(j).getFloorId())) {
                             dmMeetingRoomDto.setDmFloor(meetingFloorList.get(j));
                             break;
                         }
@@ -247,9 +247,9 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
                 }
             }
         }
-        if(list.size() > 0){
-            for(DmMeetingRoomDto dmMeetingRoomDto : list){
-                if(ObjectUtils.isEmpty(reservationVO.getDate())){
+        if (list.size() > 0) {
+            for (DmMeetingRoomDto dmMeetingRoomDto : list) {
+                if (ObjectUtils.isEmpty(reservationVO.getDate())) {
                     reservationVO.setDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 }
                 JSONObject meetingRoomUsageByDayV2 = dmMeetingService.getMeetingRoomUsageByDayV2(dmMeetingRoomDto.getRoomId(), reservationVO.getDate());
@@ -258,7 +258,7 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
                 dmMeetingRoomDto.setDmMeetingList(dmMeeting);
 
                 dmMeetingRoomDto.setMeetingRoomUsage(meetingRoomUsageByDayV2.getJSONArray("timeRange"));
-                List<Integer> monthList = dmMeetingService.getMeetingRoomUsageByMonth(dmMeetingRoomDto.getRoomId(),reservationVO.getDate());
+                List<Integer> monthList = dmMeetingService.getMeetingRoomUsageByMonth(dmMeetingRoomDto.getRoomId(), reservationVO.getDate());
                 dmMeetingRoomDto.setMeetingRoomUsageMonth(monthList);
 
                 newDmMeetingRoomDtoList.add(dmMeetingRoomDto);
@@ -269,7 +269,7 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public MeetingRoom meetingRoomDetails(Long roomId){
+    public MeetingRoom meetingRoomDetails(Long roomId) {
         //查询会议室基础信息
         MeetingRoom meetingRoom = this.getById(roomId);
 
@@ -283,21 +283,21 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         List<MeetingInfo> meetingList = meetingInfoRepository.queryTodayMeetingByRoomId(roomId);
 
         LambdaQueryWrapper<SysUser> sysUserQuery = Wrappers.lambdaQuery();
-        sysUserQuery.eq(SysUser::getTenantId,SecurityUtils.getTenantId());
+        sysUserQuery.eq(SysUser::getTenantId, SecurityUtils.getTenantId());
         List<SysUser> userList = sysUserService.list(sysUserQuery);
-        if(userList.size() <= 0){
+        if (userList.size() <= 0) {
             throw new BusinessException("用户信息不能为空");
         }
-        if(!ObjectUtil.isEmpty(meetingList)){
-            for(MeetingInfo dmMeeting : meetingList){
+        if (!ObjectUtil.isEmpty(meetingList)) {
+            for (MeetingInfo dmMeeting : meetingList) {
                 //参会人员信息
                 List<SysUser> attendeeUserList = new ArrayList<>();
-                List<MeetingAttendee> attendeeList = meetingAttendeeRepository.findMeetingAttendeeList(dmMeeting.getMeetingId(),null, SecurityUtils.getTenantId());
-                if(attendeeList.size() > 0){
+                List<MeetingAttendee> attendeeList = meetingAttendeeRepository.findMeetingAttendeeList(dmMeeting.getMeetingId(), null, SecurityUtils.getTenantId());
+                if (attendeeList.size() > 0) {
                     for (int i = 0; i < attendeeList.size(); i++) {
                         Long uid = attendeeList.get(i).getUserId();
                         for (int j = 0; j < userList.size(); j++) {
-                            if(uid.equals(userList.get(j).getUserId())){
+                            if (uid.equals(userList.get(j).getUserId())) {
                                 attendeeUserList.add(userList.get(j));
                                 break;
                             }
@@ -307,7 +307,7 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
                 dmMeeting.setUsers(attendeeUserList);
                 //发起人信息
                 for (int i = 0; i < userList.size(); i++) {
-                    if(userList.get(i).getUserId().equals(Long.valueOf(dmMeeting.getInitiatorId()))){
+                    if (userList.get(i).getUserId().equals(Long.valueOf(dmMeeting.getInitiatorId()))) {
                         dmMeeting.setInitiatorUser(userList.get(i));
                         break;
                     }
@@ -323,13 +323,13 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         return meetingRoom;
     }
 
-    public boolean checkNameUnique(MeetingRoom meetingRoom){
-        Long id = null == meetingRoom.getRoomId()?-1:meetingRoom.getRoomId();
+    public boolean checkNameUnique(MeetingRoom meetingRoom) {
+        Long id = null == meetingRoom.getRoomId() ? -1 : meetingRoom.getRoomId();
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MeetingRoom::getRoomName,meetingRoom.getRoomName())
+        queryWrapper.eq(MeetingRoom::getRoomName, meetingRoom.getRoomName())
                 .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId());
         MeetingRoom one = this.getOne(queryWrapper);
-        return null != one && !Objects.equals(one.getRoomId(),id);
+        return null != one && !Objects.equals(one.getRoomId(), id);
 
     }
 }

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

@@ -5,6 +5,11 @@ import lombok.Data;
 @Data
 public class MeetingRoomReservationVO {
 
+    /**
+     * 会议室id
+     */
+    private Long meetingRoomId;
+
     /**
      * 会议室名称
      */