ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-24 10:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

update modules/core: mod 6 files

Browse Source
This commit is contained in:
jack ning
2025-04-14 11:55:26 +08:00
parent 465b8ac483
commit c08cc2df7c
6 changed files with 59 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/main/java/com/bytedesk/core/message/AbstractMessageEntity.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-10-18 14:30:00
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-04-09 17:29:07
* @LastEditTime: 2025-04-14 11:54:54
* @Description: 消息实体抽象基类，用于统一所有消息类型的字段结构
*/
package com.bytedesk.core.message;
@@ -70,4 +70,5 @@ public abstract class AbstractMessageEntity extends BaseEntity {
@Builder.Default
@Column(name = "message_user", length = BytedeskConsts.COLUMN_EXTRA_LENGTH)
private String user = BytedeskConsts.EMPTY_JSON_STRING;
}

18
modules/core/src/main/java/com/bytedesk/core/message/MessageExcel.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-05-22 22:12:03
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2024-07-30 17:00:01
* @LastEditTime: 2025-04-14 11:53:07
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -23,20 +23,20 @@ import lombok.Data;
@Data
public class MessageExcel {
@ExcelProperty(value = "threadTopic")
@ColumnWidth(20)
private String threadTopic;
@ExcelProperty(value = "Content")
@ExcelProperty(value = "内容")
@ColumnWidth(20)
private String content;
@ExcelProperty(value = "Type")
@ExcelProperty(value = "类型")
@ColumnWidth(20)
private String type;
@ExcelProperty(value = "updatedAt")
@ExcelProperty(value = "发送者")
@ColumnWidth(20)
private String updatedAt;
private String sender;
@ExcelProperty(value = "时间")
@ColumnWidth(20)
private String createdAt;
}

5
modules/core/src/main/java/com/bytedesk/core/message/MessageResponse.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-02-21 10:00:55
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-04-14 10:51:05
* @LastEditTime: 2025-04-14 11:34:53
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -53,9 +53,6 @@ public class MessageResponse extends BaseResponse {
private ThreadResponse thread;
// private String topic;
// private String threadUid;
private UserProtobuf user;

41
modules/core/src/main/java/com/bytedesk/core/message/MessageRestService.java
View File

@@ -2,7 +2,7 @@
* @Author: jackning 270580156@qq.com
* @Date: 2024-01-29 16:21:24
* @LastEditors: jackning 270580156@qq.com
* @LastEditTime: 2025-04-14 11:00:02
* @LastEditTime: 2025-04-14 11:53:54
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
@@ -25,7 +25,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson2.JSON;
import com.bytedesk.core.base.BaseRestService;
import com.bytedesk.core.base.BaseRestServiceWithExcel;
import com.bytedesk.core.rbac.auth.AuthService;
import com.bytedesk.core.rbac.user.UserEntity;
import com.bytedesk.core.utils.ConvertUtils;
@@ -36,16 +36,21 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@AllArgsConstructor
public class MessageRestService extends BaseRestService<MessageEntity, MessageRequest, MessageResponse> {
public class MessageRestService extends BaseRestServiceWithExcel<MessageEntity, MessageRequest, MessageResponse, MessageExcel> {
private final MessageRepository messageRepository;
private final AuthService authService;
public Page<MessageResponse> queryByOrg(MessageRequest request) {
@Override
public Page<MessageEntity> queryByOrgEntity(MessageRequest request) {
Pageable pageable = request.getPageable();
Specification<MessageEntity> specs = MessageSpecification.search(request);
Page<MessageEntity> messagePage = messageRepository.findAll(specs, pageable);
return messageRepository.findAll(specs, pageable);
}
public Page<MessageResponse> queryByOrg(MessageRequest request) {
Page<MessageEntity> messagePage = queryByOrgEntity(request);
return messagePage.map(this::convertToResponse);
}
@@ -60,14 +65,12 @@ public class MessageRestService extends BaseRestService<MessageEntity, MessageRe
return queryByOrg(request);
}
// @Cacheable(value = "message", key = "#request.topic", unless = "#result ==
// null")
// public Page<MessageResponse> queryByTopic(MessageRequest request) {
// Pageable pageable = request.getPageable();
// Specification<MessageEntity> specs = MessageSpecification.search(request);
// Page<MessageEntity> messagePage = messageRepository.findAll(specs, pageable);
// return messagePage.map(ConvertUtils::convertToMessageResponse);
// }
@Override
public MessageResponse queryByUid(MessageRequest request) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'queryByUid'");
}
@Cacheable(value = "message", key = "#uid", unless = "#result == null")
public Optional<MessageEntity> findByUid(String uid) {
@@ -188,11 +191,15 @@ public class MessageRestService extends BaseRestService<MessageEntity, MessageRe
}
return null;
}
@Override
public MessageResponse queryByUid(MessageRequest request) {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'queryByUid'");
public MessageExcel convertToExcel(MessageEntity entity) {
MessageExcel messageExcel = new MessageExcel();
messageExcel.setType(entity.getType());
messageExcel.setContent(entity.getContent());
messageExcel.setSender(entity.getUser());
messageExcel.setCreatedAt(entity.getCreatedAt().toString());
return messageExcel;
}
}