冲突解决

src/main/java/admin/server/VoiceWebSocketServer.java

@@ -103,20 +103,20 @@ public class VoiceWebSocketServer {
     @OnMessage(maxMessageSize = 10*1024*1024)
     public void onTextMessage(Session session,String message) throws IOException {
 //        session.setMaxBinaryMessageBufferSize(50 * 1024 * 1024);
-        log.info("message:{}",message);
+        log.info("message:{}", message);
         @SuppressWarnings({"unchecked"})
-        Map<String,Object> map = JSON.parseObject(message,Map.class);
-        WebSocketModel webSocketModel = JSON.parseObject(message,WebSocketModel.class);
+        Map<String, Object> map = JSON.parseObject(message, Map.class);
+        WebSocketModel webSocketModel = JSON.parseObject(message, WebSocketModel.class);
         //1.如果问题不存在则创建问题
         ChatgptRoleSession byId = chatgptRoleSessionService.getById(webSocketModel.getSessionId());
-        if (byId == null&&webSocketModel.getAction().equals("text")){
+        if (byId == null && webSocketModel.getAction().equals("text")) {
             ChatgptRoleSession chatgptRoleSession = new ChatgptRoleSession();
             chatgptRoleSession.setId(Integer.valueOf(webSocketModel.getSessionId()));
             chatgptRoleSession.setName(webSocketModel.getData());
             chatgptRoleSession.setRoleDescId(10001);
             chatgptRoleSession.setUserId(ScreenEnum.getByUserName(webSocketModel.getName()));
             chatgptRoleSessionService.save(chatgptRoleSession);
-        }else if (byId!=null && webSocketModel.getAction().equals("text")){
+        } else if (byId != null && webSocketModel.getAction().equals("text")) {
             ChatgptRoleRecords chatgptRoleRecords = new ChatgptRoleRecords();
             chatgptRoleRecords.setMessage(webSocketModel.getData());
             chatgptRoleRecords.setReceiverId(10001);
@@ -126,15 +126,15 @@ public class VoiceWebSocketServer {
         }
         String msg = "";
         // 文字聊天
-        if("sendText".equals(map.get("action"))){
-             msg = (String)map.get("data");
-        if("sendText".equals(webSocketModel.getAction())){
-             msg = webSocketModel.getData();
-        }
-        if(msg != null && !msg.isEmpty()){
-            maxkbOpenApiService.talk(msg,session);
+        if ("sendText".equals(map.get("action"))) {
+            msg = (String) map.get("data");
+            if ("sendText".equals(webSocketModel.getAction())) {
+                msg = webSocketModel.getData();
+            }
+            if (msg != null && !msg.isEmpty()) {
+                maxkbOpenApiService.talk(msg, session);
+            }
         }
-
     }
 
 //    @OnMessage