zwhui 2 anni fa
parent
commit
06da32d8ba

+ 2 - 3
netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUserConversation.java

@@ -1,6 +1,5 @@
 package com.cyksj.model.entity;
 
-import com.cyksj.model.dto.MessageButton;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -88,11 +87,11 @@ public class MidjourneyUserConversation extends BaseEntity implements Serializab
     /**
      * 按钮
      */
-    private List<MessageButton> buttons;
+    private String buttons;
 
     /**
      * 属性
      */
-    private Map<String, Object> properties;
+    private String properties;
 
 }

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -14,6 +14,7 @@ import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.MidjourneyUserConversationMapper;
 import com.cyksj.model.dto.BlendDimensions;
+import com.cyksj.model.dto.MessageButton;
 import com.cyksj.model.entity.MidjourneyAccount;
 import com.cyksj.model.entity.MidjourneyUser;
 import com.cyksj.model.entity.MidjourneyUserConversation;
@@ -127,7 +128,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         if (!user.getMode().equals(conversation.getMode())) {
             throw BusinessRuntimeException.getInstance("当前出图模式与关联任务出图模式不符");
         }
-        conversation.getButtons().forEach(button -> {
+        Jsons.parseList(conversation.getButtons(), MessageButton.class).forEach(button -> {
             if (button.getCustomId().equals(customId)) {
                 button.setStyle(3);
             }