feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-12 16:58:48 +08:00
parent b8ddd0d8d6
commit eaa887e417
2 changed files with 2 additions and 7 deletions

View File

@ -97,7 +97,6 @@ public class TicketController extends ControllerBase {
/** /**
* 关注或取消关注工单 * 关注或取消关注工单
*
* @param request 请求信息 * @param request 请求信息
**/ **/
@PostMapping("followTiket") @PostMapping("followTiket")
@ -309,7 +308,6 @@ public class TicketController extends ControllerBase {
/** /**
* 获取工单聊天记录 * 获取工单聊天记录
*
* @param ticketId 工单编号 * @param ticketId 工单编号
* @return 聊天记录 * @return 聊天记录
**/ **/
@ -321,7 +319,6 @@ public class TicketController extends ControllerBase {
/** /**
* 添加聊天记录 * 添加聊天记录
*
* @param request 请求信息 * @param request 请求信息
**/ **/
@PostMapping("addChatMessage") @PostMapping("addChatMessage")
@ -329,8 +326,7 @@ public class TicketController extends ControllerBase {
public ApiResult<Void> addChatMessage(@Valid @RequestBody AddChatMessageRequest request) { public ApiResult<Void> addChatMessage(@Valid @RequestBody AddChatMessageRequest request) {
Ticket ticket = ticketService.getById(request.getTicketId()); Ticket ticket = ticketService.getById(request.getTicketId());
VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在"); VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
VUtils.trueThrowBusinessError(Objects.equals(ticket.getState(), TicketState.Revoked.getState()) VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.Processing.getState()) > 1)
|| Objects.equals(ticket.getState(), TicketState.Closed.getState()))
.throwMessage("当前工单状态不允许发送消息"); .throwMessage("当前工单状态不允许发送消息");
AdminUser user = adminUserService.getById(AdminUserUtil.getUserId()); AdminUser user = adminUserService.getById(AdminUserUtil.getUserId());
ChatMessageDTO message = new ChatMessageDTO() ChatMessageDTO message = new ChatMessageDTO()

View File

@ -214,8 +214,7 @@ public class TiketController extends ControllerBase {
public ApiResult<Void> addChatMessage(@Valid @RequestBody AddChatMessageRequest request){ public ApiResult<Void> addChatMessage(@Valid @RequestBody AddChatMessageRequest request){
Ticket ticket = ticketService.getById(request.getTicketId()); Ticket ticket = ticketService.getById(request.getTicketId());
VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在"); VUtils.trueThrowBusinessError(Objects.isNull(ticket)).throwMessage("工单不存在");
VUtils.trueThrowBusinessError(Objects.equals(ticket.getState(), TicketState.Revoked.getState()) VUtils.trueThrowBusinessError(Byte.compare(ticket.getState(), TicketState.Processing.getState()) > 1)
|| Objects.equals(ticket.getState(), TicketState.Closed.getState()))
.throwMessage("当前工单状态不允许发送消息"); .throwMessage("当前工单状态不允许发送消息");
AppUser user = appUserService.getById(AppUserUtil.getUserId()); AppUser user = appUserService.getById(AppUserUtil.getUserId());
ChatMessageDTO message = new ChatMessageDTO() ChatMessageDTO message = new ChatMessageDTO()