fix 去掉引入的dao包

luma/pom.xml

@@ -188,12 +188,6 @@
             <artifactId>cos_api</artifactId>
             <version>5.6.34</version>
         </dependency>
-        <dependency>
-            <groupId>com.netflix</groupId>
-            <artifactId>netflix-dao</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
 
          <dependency>
                 <groupId>org.bytedeco</groupId>

luma/src/main/java/com/yhlxj/dao/model/dto/BlendDimensions.java

@@ -0,0 +1,21 @@
+package com.yhlxj.dao.model.dto;
+
+
+import lombok.Getter;
+
+@Getter
+public enum BlendDimensions {
+
+	PORTRAIT("2:3"),
+
+	SQUARE("1:1"),
+
+	LANDSCAPE("3:2");
+
+	private final String value;
+
+	BlendDimensions(String value) {
+		this.value = value;
+	}
+
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitActionDTO.java

@@ -0,0 +1,25 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author zwhui
+ * @date 2024/4/24 10:56
+ */
+@Data
+public class SubmitActionDTO {
+    /**
+     * 任务对应按钮的customId
+     */
+    @NotBlank(message = "customId参数不能为空")
+    private String customId;
+
+    /**
+     * 执行Imagine任务生成的ID
+     */
+    @NotNull(message = "任务ID不能为空")
+    private Long taskId;
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitBlendDTO.java

@@ -0,0 +1,25 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @author zwhui
+ * @date 2024/4/23 13:49
+ */
+@Data
+public class SubmitBlendDTO {
+
+	/**
+	 * base64
+	 */
+	@NotBlank(message = "请上传至少一张图片")
+	private List<String> base64Array;
+
+	/**
+	 * 比例: PORTRAIT(2:3); SQUARE(1:1); LANDSCAPE(3:2)
+	 */
+	private BlendDimensions dimensions = BlendDimensions.SQUARE;
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitDescribeDTO.java

@@ -0,0 +1,19 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author zwhui
+ * @date 2024/4/23 13:49
+ */
+@Data
+public class SubmitDescribeDTO {
+
+	/**
+	 * base64
+	 */
+	@NotBlank(message = "请上传图片")
+	private String base64;
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitModalDTO.java

@@ -0,0 +1,30 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author zwhui
+ * @date 2024/4/23 18:04
+ */
+@Data
+public class SubmitModalDTO {
+
+    /**
+     * 局部重绘base64
+     */
+    private String maskBase64;
+
+    /**
+     * 提示词
+     */
+    private String prompt;
+
+    /**
+     * 任务id
+     */
+    @NotNull(message = "任务ID不能为空")
+    private Long taskId;
+
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitShortenDTO.java

@@ -0,0 +1,19 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author zwhui
+ * @date 2024/4/23 18:07
+ */
+@Data
+public class SubmitShortenDTO {
+
+    /**
+     * 提示词
+     */
+    @NotBlank(message = "提示词不能为空")
+    private String prompt;
+}

luma/src/main/java/com/yhlxj/dao/model/dto/SubmitVideoDTO.java

@@ -0,0 +1,41 @@
+package com.yhlxj.dao.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zwhui
+ * @date 2024/4/23 13:49
+ */
+@Data
+public class SubmitVideoDTO {
+
+    /**
+     * 任务id
+     */
+    private String taskId;
+
+    /**
+     * 提示词
+     */
+    private String prompt;
+
+    /**
+     * 增强提示
+     */
+    private Boolean expandPrompt;
+
+    private String picture;
+
+    /**
+     * 结束帧
+     */
+    private String imageEndUrl;
+
+    /**
+     * 垫图base64数组
+     */
+    private List<String> base64Array;
+
+}

luma/src/main/java/com/yhlxj/dao/model/entity/BaseEntity.java

@@ -0,0 +1,35 @@
+package com.yhlxj.dao.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author chan
+ * @date 2021-10-10 下午12:18
+ */
+@Data
+@Accessors(chain = true)
+public class BaseEntity {
+
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createdTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

luma/src/main/java/com/yhlxj/dao/model/entity/LumaUserApiProvider.java

@@ -1,6 +1,6 @@
 package com.yhlxj.dao.model.entity;
 
-import com.cyksj.model.BaseEntity;
+
 import lombok.Getter;
 import lombok.Setter;
 

luma/src/main/java/com/yhlxj/dao/model/entity/UserMirrorShop.java

@@ -2,7 +2,6 @@ package com.yhlxj.dao.model.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.cyksj.model.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 

luma/src/main/java/com/yhlxj/dao/model/views/LumaUserConversationView.java

@@ -0,0 +1,82 @@
+package com.yhlxj.dao.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: LumaUserConversationView
+ * 创建者: JavaZou
+ * 创建时间:2024/6/4 13:54
+ */
+@Getter
+@Setter
+@SearchBean(tables = "luma_user_conversation luc",
+		orderBy = "luc.created_time desc")
+public class LumaUserConversationView {
+
+	@DbField("luc.id")
+	private Long rid;
+
+	@DbField("luc.user_id")
+	private Long userId;
+
+
+	/**
+	 * 任务id
+	 */
+	@DbField("luc.task_id")
+	private String taskId;
+
+	/**
+	 * 开始时间
+	 */
+	@DbField("luc.start_time")
+	private Long startTime;
+
+	/**
+	 * 完成时间
+	 */
+	@DbField("luc.finish_time")
+	private Long finishTime;
+
+	/**
+	 * 描述
+	 */
+	@DbField("luc.prompt")
+	private String prompt;
+
+	/**
+	 * 任务状态,可用值:pending
+	 */
+	@DbField("luc.status")
+	private String status;
+
+	/**
+	 * 失败原因
+	 */
+	@DbField("luc.fail_reason")
+	private String failReason;
+
+	/**
+	 * 进度
+	 */
+	@DbField("luc.progress")
+	private String progress;
+
+	/**
+	 * 视频地址
+	 */
+	@DbField("luc.video_url")
+	private String videoUrl;
+
+	@DbField("luc.thumbnail")
+	private String thumbnail;
+
+	@DbField("luc.created_time")
+	private Date createdTime;
+}

luma/src/main/java/com/yhlxj/dao/model/views/LumaUserDetailView.java

@@ -0,0 +1,28 @@
+package com.yhlxj.dao.model.views;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: LumaUserDetailView
+ * 创建者: JavaZou
+ * 创建时间:2024/6/25 15:26
+ */
+@Getter
+@Setter
+public class LumaUserDetailView {
+	private Integer useFastNum;
+
+	private Integer useRelaxNum;
+
+	private Integer mjFastNum;
+
+	private Integer mjRelaxNum;
+
+	private Long userId;
+
+	private Date expiryTime;
+}

luma/src/main/java/com/yhlxj/service/midjourney/LumaService.java

@@ -1,7 +1,7 @@
 package com.yhlxj.service.midjourney;
 
 
-import com.cyksj.model.dto.SubmitVideoDTO;
+import com.yhlxj.dao.model.dto.SubmitVideoDTO;
 import com.yhlxj.dao.model.entity.LumaUser;
 import com.yhlxj.dao.model.entity.LumaUserConversation;
 import com.yhlxj.dao.model.response.SubmitResult;

luma/src/main/java/com/yhlxj/service/midjourney/impl/LumaServiceImpl.java

@@ -15,13 +15,16 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
-import com.cyksj.model.dto.SubmitVideoDTO;
 import com.yhlxj.dao.mapper.GroupsRelationMapper;
 import com.yhlxj.dao.mapper.LumaUserApiProviderMapper;
 import com.yhlxj.dao.mapper.UserMirrorShopMapper;
 import com.yhlxj.dao.mapper.midjourney.LumaUserConversationMapper;
 import com.yhlxj.dao.mapper.midjourney.LumaUserMapper;
-import com.yhlxj.dao.model.entity.*;
+import com.yhlxj.dao.model.dto.SubmitVideoDTO;
+import com.yhlxj.dao.model.entity.GroupsRelation;
+import com.yhlxj.dao.model.entity.LumaUser;
+import com.yhlxj.dao.model.entity.LumaUserApiProvider;
+import com.yhlxj.dao.model.entity.LumaUserConversation;
 import com.yhlxj.dao.model.response.SubmitResult;
 import com.yhlxj.dao.model.response.VideoTask;
 import com.yhlxj.redis.RedisService;
@@ -148,7 +151,7 @@ public class LumaServiceImpl implements LumaService {
     }
 
     @Override
-    public SubmitResult submitVideo(LumaUser user,SubmitVideoDTO videoDTO, Long num) throws Exception {
+    public SubmitResult submitVideo(LumaUser user, SubmitVideoDTO videoDTO, Long num) throws Exception {
         Map<String, Object> videoParam = MapUtil.builder(new HashMap<String, Object>())
                 .put("aspect_ratio", "16:9")
                 .build();

luma/src/main/java/com/yhlxj/web/mirror/LumaController.java

@@ -10,15 +10,15 @@ import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
-import com.cyksj.model.dto.SubmitVideoDTO;
-import com.cyksj.model.views.LumaUserConversationView;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.util.MapUtils;
 import com.yhlxj.dao.mapper.midjourney.LumaUserMapper;
+import com.yhlxj.dao.model.dto.SubmitVideoDTO;
 import com.yhlxj.dao.model.entity.LumaUser;
 import com.yhlxj.dao.model.entity.LumaUserConversation;
 import com.yhlxj.dao.model.response.SubmitResult;
+import com.yhlxj.dao.model.views.LumaUserConversationView;
 import com.yhlxj.redis.RedisService;
 import com.yhlxj.service.midjourney.LumaService;
 import lombok.RequiredArgsConstructor;