Merge branch 'develop' of ssh://git.daoguyujia.com:10022/gogs/BackendSys into develop

db/ai_volcengine_video_task.sql

@@ -7,7 +7,7 @@ CREATE TABLE `ai_volcengine_video_task`  (
                                              `resolution` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分辨率',
                                              `duration` tinyint NULL DEFAULT NULL COMMENT '视频时长（秒）',
                                              `text` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本描述',
-                                             `camerafixed` tinyint NULL DEFAULT NULL COMMENT '是否固定镜头 1-是 0-否',
+                                             `camerafixed` tinyint NULL DEFAULT NULL COMMENT '是否固定镜头 1-是 -1-否',
                                              `quantity` tinyint NULL DEFAULT NULL COMMENT '生成数量',
                                              `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                                              `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',

db/sys_user_role_menu.sql

@@ -78,6 +78,9 @@ INSERT INTO sys_user_role_menu(id, parent_id, menu_name, menu_name_en, type, pat
     (57, 50, '商品单位', 'Goods Units', 1, '/b2c/good/b2cGoodUnit', '/src/views/b2c/good/b2cGoodUnit.vue', '{}', null, '11.4', 14),
     (58, 50, '商品单位详情', 'Goods Units Detail', 2, '/b2c/good/b2cGoodUnitDetail', '/src/views/b2c/good/b2cGoodUnitDetail.vue', '{"isBack":true,"isHide":true}', null, '11.4.1', 13),
 
+    (70, -1, 'AI工具', 'AI Tool', 1, '/aiTool', '', '{}', 'MagicStick', '37', 905),
+    (71, 70, '图生视频', 'ImgToVideo', 1, '/aiTool/imgToVideo', '', '{}', null, '37.1', 905),
+
 
     (1000, -1, '系统管理', 'Systems', 1, '/system', '', '{}', 'Setting', '3', 12),
     (1001, 1000, '用户管理', 'Users', 1, '/system/sysUserList', '/src/views/system/sysUser/sysUserList.vue', '{}', null, '3.2', 12),

db/sys_user_role_permission.sql

@@ -61,6 +61,16 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
         ('36.3', '36', 'AI短剧创作-生成图片', null),
         ('36.4', '36', 'AI短剧创作-生成视频', null),
 
+    ('37', -1, 'AI工具', 9),
+        ('37.1', '37', 'AI工具-图生视频', null),
+            ('37.1.1', '37.1', 'AI工具-创建图生视频任务', null),
+            ('37.1.2', '37.1', 'AI工具-查询图生视频任务状态', null),
+            ('37.1.3', '37.1', 'AI工具-图生视频任务列表', null),
+            ('37.1.4', '37.1', 'AI工具-图生视频任务收藏/取消收藏', null),
+
+
+
+
 
 
      ('3', -1, '系统用户管理', 900),

db/sys_user_role_permission_relation.sql

@@ -119,6 +119,12 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
             (1, '36.2.6'), (1, '36.2.6.1'),
         (1, '36.3'),
         (1, '36.4'),
+    (1, '37'),
+        (1, '37.1'),
+            (1, '37.1.1'),
+            (1, '37.1.2'),
+            (1, '37.1.3'),
+            (1, '37.1.4'),
 
     (1, '100'),
         (1, '101'),

src/main/java/com/backendsys/modules/ai/volcengine/controller/VolcengineVideoController.java

@@ -10,6 +10,7 @@ import com.backendsys.modules.common.utils.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,7 +26,7 @@ public class VolcengineVideoController {
 
 
     @Operation(summary = "创建图生视频任务")
-//    @PreAuthorize("@sr.hasPermission('36.4')")
+    @PreAuthorize("@sr.hasPermission('37.1.1')")
     @PostMapping("/api/ai/volcegine/generateVideo")
     public Result generateVideo(@Validated(VolcengineVideoTask.Generate.class) @RequestBody VolcengineVideoTask volcengineVideoTask) {
         volcengineVideoTask.setUser_id(SecurityUtil.getUserId());
@@ -33,7 +34,7 @@ public class VolcengineVideoController {
     }
 
     @Operation(summary = "查询图生视频任务状态")
-//    @PreAuthorize("@sr.hasPermission('36.4')")
+    @PreAuthorize("@sr.hasPermission('37.1.2')")
     @GetMapping("/api/ai/volcegine/video/getTaskStatus/{volcengineTaskId}")
     public Result getTaskStatus(@PathVariable String volcengineTaskId) {
         return Result.success().put("data", volcengineVideoTaskService.selectTaskStatus(volcengineTaskId));
@@ -41,7 +42,7 @@ public class VolcengineVideoController {
 
 
     @Operation(summary = "分页获取图生视频任务记录")
-//    @PreAuthorize("@sr.hasPermission('36.4')")
+    @PreAuthorize("@sr.hasPermission('37.1.3')")
     @GetMapping("/api/ai/volcegine/video/getTaskList")
     public Result getTaskList(VolcengineVideoTaskDTO dto) {
         dto.setUser_id(SecurityUtil.getUserId());
@@ -49,7 +50,7 @@ public class VolcengineVideoController {
     }
 
     @Operation(summary = "视频收藏/取消收藏")
-//    @PreAuthorize("@sr.hasPermission('36.4')")
+    @PreAuthorize("@sr.hasPermission('37.1.4')")
     @PutMapping("/api/ai/volcegine/video/setCollect")
     public Result setCollect(@Validated(VolcengineVideoCollect.Collect.class) @RequestBody VolcengineVideoCollect volcengineVideoCollect) {
         volcengineVideoCollect.setUser_id(SecurityUtil.getUserId());

src/main/java/com/backendsys/modules/ai/volcengine/entity/VolcengineVideoTask.java

@@ -61,7 +61,7 @@ public class VolcengineVideoTask {
     private String text;
 
     /**
-     * 是否固定镜头 1-是 0-否
+     * 是否固定镜头 1-是 -1-否
      */
     private Integer camerafixed;
 
@@ -81,7 +81,7 @@ public class VolcengineVideoTask {
     private List<VolcengineVideoTaskDetail> detail_list;
 
     /**
-     * 是否收藏 1-是 0-否
+     * 是否收藏 1-是 -1-否
      */
     @TableField(exist = false)
     private Integer is_collect;

src/main/java/com/backendsys/modules/ai/volcengine/entity/VolcengineVideoTaskDTO.java

@@ -21,7 +21,7 @@ public class VolcengineVideoTaskDTO {
     private String create_end_date;
 
     /**
-     * 是否只看收藏 1-是 0-否
+     * 是否只看收藏 1-是 -1-否
      */
     private Integer only_collections;
 

src/main/java/com/backendsys/modules/ai/volcengine/entity/VolcengineVideoTaskDetail.java

@@ -69,7 +69,7 @@ public class VolcengineVideoTaskDetail {
     private LocalDateTime update_time;
 
     /**
-     * 是否收藏 1-是 0-否
+     * 是否收藏 1-是 -1-否
      */
     @TableField(exist = false)
     private Integer is_collect;

src/main/resources/mapper/ai/volcengine/VolcengineVideoTaskDao.xml

@@ -94,7 +94,7 @@
     <select id="selectTaskList" resultMap="resultMapTask">
         SELECT
             <include refid="includeVolcengineVideoTask" />
-            , IF(avc.task_id IS NOT NULL, 1, 0) AS is_collect
+            , IF(avc.task_id IS NOT NULL, 1, -1) AS is_collect
         FROM ai_volcengine_video_task avvt
         LEFT JOIN (
             SELECT
@@ -120,7 +120,7 @@
     <select id="queryDetailById" resultType="com.backendsys.modules.ai.volcengine.entity.VolcengineVideoTaskDetail">
         SELECT
             <include refid="includeVolcengineVideoTaskDetail" />
-            , IF(avc.task_id IS NOT NULL, 1, 0) AS is_collect
+            , IF(avc.task_id IS NOT NULL, 1, -1) AS is_collect
         FROM ai_volcengine_video_task_detail avvtd
         LEFT JOIN ai_volcengine_video_collect avc
             ON avc.task_id = avvtd.task_id