优化代码

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -17,19 +17,9 @@ import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.ImLiveBroadcastRoomDto;
 import com.ym.mec.biz.dal.dto.RoomReservationUserSearch;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.dto.RoomReservationUserSearch;
-import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoom;
-import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoomData;
-import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoomMember;
-import com.ym.mec.biz.dal.entity.ImLiveRoomBlack;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.LiveRoomGoodsOrderQueryInfo;
-import com.ym.mec.biz.dal.vo.BaseRoomUserVo;
-import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
-import com.ym.mec.biz.dal.vo.RoomReservationUserVo;
-import com.ym.mec.biz.dal.vo.RoomReservationUserVo;
-import com.ym.mec.biz.dal.vo.LiveRoomGoodsOrderVo;
-import com.ym.mec.biz.dal.vo.RoomUserInfoVo;
+import com.ym.mec.biz.dal.vo.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.ImRoomMessage;
 import com.ym.mec.common.entity.ImUserState;
@@ -59,7 +49,6 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1185,7 +1174,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
     @Override
     public PageInfo<RoomReservationUserVo> queryRoomUser(RoomReservationUserSearch query) {
-        IPage<RoomReservationUserVo> page = new Page<>(query.getPage(),query.getRows());
+        IPage<RoomReservationUserVo> page = new Page<>(query.getPage(), query.getRows());
         page = baseMapper.queryRoomUser(page, query);
         return PageUtil.pageInfo(page);
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveRoomReservationServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ImLiveRoomReservationDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.entity.ImLiveBroadcastRoom;
 import com.ym.mec.biz.dal.entity.ImLiveRoomReservation;
 import com.ym.mec.biz.dal.entity.Student;
@@ -16,7 +15,6 @@ import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.vo.ImLiveBroadcastRoomVo;
 import com.ym.mec.biz.service.ImLiveRoomReservationService;
 import com.ym.mec.biz.service.StudentService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -33,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiConsumer;
 
 /**
  * 直播预约记录(ImLiveRoomReservation)表服务实现类
@@ -87,19 +84,19 @@ public class ImLiveRoomReservationServiceImpl extends ServiceImpl<ImLiveRoomRese
     @Override
     public PageInfo<ImLiveBroadcastRoomVo> queryPageStudent(Map<String, Object> param) {
         SysUser user = getUser();
-        Page<ImLiveBroadcastRoomVo> pageInfo = PageUtil.concatTimePage(param,"startTime","endTime");
+        Page<ImLiveBroadcastRoomVo> pageInfo = PageUtil.concatTimePage(param, "startTime", "endTime");
         pageInfo.setDesc("a.created_time_");
         param.put("userId", user.getId());
         param.put("tenantId", TenantContextHolder.getTenantId());
         //查询该学员 所属分部
         Integer organId = user.getOrganId();
-        if(Objects.nonNull(organId)){
+        if (Objects.nonNull(organId)) {
             param.put("organId", organId);
         }
         //合作单位
         Student student = studentService.get(user.getId());
-        if(Objects.nonNull(student) && Objects.nonNull(student.getCooperationOrganId())){
-            param.put("schoolId",student.getCooperationOrganId());
+        if (Objects.nonNull(student) && Objects.nonNull(student.getCooperationOrganId())) {
+            param.put("schoolId", student.getCooperationOrganId());
         }
         IPage<ImLiveBroadcastRoomVo> page = baseMapper.queryPageStudent(pageInfo, param);
         return PageUtil.pageInfo(page);