Merge branch 'prod/20260407' into test

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/event/TicketCallBeginEvent.java

@@ -47,6 +47,6 @@ public class TicketCallBeginEvent extends ApplicationEvent implements Applicatio
                 .setCreateTime(Instant.now());
         ticketChatService.addMessage(Long.valueOf(ticketId), message);
         //推送消息
-        ssePushService.sendTicketMessage(Long.valueOf(ticketId), message,language);
+        ssePushService.sendTicketMessage(Long.valueOf(ticketId), message, language);
     }
 }

nflg-mobilebroken-admin/src/test/java/TTest.java

@@ -8,6 +8,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.Objects;
 
 public class TTest {
 
@@ -43,4 +44,10 @@ public class TTest {
         System.out.println(password);
         Assertions.assertTrue(PASSWORDENCODER.matches("Nflg0331", password), "密码不正确");
     }
+
+    @Test
+    public void test5() {
+        String message = null;
+        System.out.println((Objects.isNull(message) ? "" : message) + "发送了消息");
+    }
 }

nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/dto/ChatMessageDTO.java

@@ -33,6 +33,10 @@ public class ChatMessageDTO {
     // 消息内容前缀
     private String contentPre;
 
+    public String getContentPre() {
+        return Objects.isNull(contentPre) ? "" : contentPre;
+    }
+
     // 消息内容
     private String content;