|
|
@@ -23,7 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
|
|
/**
|
|
|
@@ -69,6 +71,7 @@ public class LocalImMsgService extends BaseService<ImRoomMsgMapper, ImMsgEntity,
|
|
|
if (StrUtil.isEmpty(vo.getAssistId()) && StrUtil.isEmpty(vo.getDoctorId())) {
|
|
|
throw new CustomException("看护人id和医生id不能同时为空");
|
|
|
}
|
|
|
+
|
|
|
String userId=StrUtil.isEmpty(vo.getAssistId())?vo.getDoctorId():vo.getAssistId();
|
|
|
AtomicLong result=new AtomicLong(0);
|
|
|
List<ImRoomEntity> rooms = imRoomService.list(new QueryWrapper<ImRoomEntity>()
|
|
|
@@ -77,6 +80,7 @@ public class LocalImMsgService extends BaseService<ImRoomMsgMapper, ImMsgEntity,
|
|
|
.eq(StrUtil.isNotEmpty(vo.getAssistId()), ImRoomEntity::getAssistId, vo.getAssistId())
|
|
|
.eq(StrUtil.isNotEmpty(vo.getDoctorId()), ImRoomEntity::getDoctorId, vo.getDoctorId())
|
|
|
.eq(ImRoomEntity::getStatus, ImStatusEnum.SUCCESS)
|
|
|
+// .ge(ImRoomEntity::getSuccessTime,new Date(System.currentTimeMillis()- TimeUnit.DAYS.toMillis(30)))
|
|
|
);
|
|
|
if(CollectionUtil.isNotEmpty(rooms)){
|
|
|
rooms.stream()
|