|
|
@ -19,6 +19,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.feign.SendMessageClient;
|
|
|
|
import com.baiye.feign.SendMessageClient;
|
|
|
|
|
|
|
|
import com.baiye.http.CommonResponse;
|
|
|
|
import com.baiye.model.dto.SendWebSocketDTO;
|
|
|
|
import com.baiye.model.dto.SendWebSocketDTO;
|
|
|
|
import com.baiye.modules.system.domain.MessageNotification;
|
|
|
|
import com.baiye.modules.system.domain.MessageNotification;
|
|
|
|
import com.baiye.modules.system.domain.UserMessage;
|
|
|
|
import com.baiye.modules.system.domain.UserMessage;
|
|
|
@ -72,7 +73,7 @@ public class UserMessageServiceImpl implements UserMessageService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<UserMessageDto> queryAll(UserMessageQueryCriteria criteria){
|
|
|
|
public List<UserMessageDto> queryAll(UserMessageQueryCriteria criteria){
|
|
|
|
Sort sort = Sort.by(Sort.Direction.ASC, "level").
|
|
|
|
Sort sort = Sort.by(Sort.Direction.ASC, "level").
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "type")).
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "isTop")).
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "isRead")).
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "isRead")).
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "createTime"));
|
|
|
|
and(Sort.by(Sort.Direction.DESC, "createTime"));
|
|
|
|
return userMessageMapper.toDto(userMessageRepository.findAll(
|
|
|
|
return userMessageMapper.toDto(userMessageRepository.findAll(
|
|
|
@ -112,18 +113,18 @@ public class UserMessageServiceImpl implements UserMessageService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void download(List<UserMessageDto> all, HttpServletResponse response) throws IOException {
|
|
|
|
public void download(List<UserMessageDto> all, HttpServletResponse response) throws IOException {
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
|
for (UserMessageDto UserMessage : all) {
|
|
|
|
for (UserMessageDto userMessageDto : all) {
|
|
|
|
Map<String,Object> map = new LinkedHashMap<>();
|
|
|
|
Map<String,Object> map = new LinkedHashMap<>();
|
|
|
|
map.put("是否已读", UserMessage.getIsRead());
|
|
|
|
map.put("是否已读", userMessageDto.getIsRead());
|
|
|
|
map.put("开始时间", UserMessage.getStartTime());
|
|
|
|
map.put("开始时间", userMessageDto.getStartTime());
|
|
|
|
map.put("结束时间", UserMessage.getEndTime());
|
|
|
|
map.put("结束时间", userMessageDto.getEndTime());
|
|
|
|
map.put("消息内容", UserMessage.getMessageContext());
|
|
|
|
map.put("消息内容", userMessageDto.getMessageContext());
|
|
|
|
map.put("消息等级", UserMessage.getLevel());
|
|
|
|
map.put("消息等级", userMessageDto.getLevel());
|
|
|
|
map.put("用户id", UserMessage.getUserId());
|
|
|
|
map.put("用户id", userMessageDto.getUserId());
|
|
|
|
map.put("创建者", UserMessage.getCreateBy());
|
|
|
|
map.put("创建者", userMessageDto.getCreateBy());
|
|
|
|
map.put("更新者", UserMessage.getUpdateBy());
|
|
|
|
map.put("更新者", userMessageDto.getUpdateBy());
|
|
|
|
map.put("创建日期", UserMessage.getCreateTime());
|
|
|
|
map.put("创建日期", userMessageDto.getCreateTime());
|
|
|
|
map.put("更新时间", UserMessage.getUpdateTime());
|
|
|
|
map.put("更新时间", userMessageDto.getUpdateTime());
|
|
|
|
list.add(map);
|
|
|
|
list.add(map);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FileUtil.downloadExcel(list, response);
|
|
|
|
FileUtil.downloadExcel(list, response);
|
|
|
@ -159,4 +160,9 @@ public class UserMessageServiceImpl implements UserMessageService {
|
|
|
|
return userMessageRepository.deleteUserMessageByMessageId(num, messageId);
|
|
|
|
return userMessageRepository.deleteUserMessageByMessageId(num, messageId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public CommonResponse<Boolean> createUserMessage(String body) {
|
|
|
|
|
|
|
|
return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|