Bläddra i källkod

Dev drama storyboard

tsurumure 2 månader sedan
förälder
incheckning
021b3b9d96

+ 3 - 1
db/sys_user_role_permission.sql

@@ -50,7 +50,9 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
         ('36.2', '36', 'AI短剧创作-分镜管理', null),
             ('36.2.1', '36.2', 'AI短剧创作-分镜列表', null),
             ('36.2.2', '36.2', 'AI短剧创作-创建分镜', null),
-            ('36.2.3', '36.2', 'AI短剧创作-编辑分镜配置', null),
+            ('36.2.3', '36.2', 'AI短剧创作-编辑生图/生视频配置', null),
+            ('36.2.4', '36.2', 'AI短剧创作-编辑分镜 (全权限)', null),
+                ('36.2.4.1', '36.2.4', 'AI短剧创作-编辑分镜 (自己)', null),
 
 
 

+ 4 - 2
db/sys_user_role_permission_relation.sql

@@ -108,8 +108,10 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
             (1, '36.1.5'), (1, '36.1.5.1'),
             (1, '36.1.6'), (1, '36.1.6.1'),
         (1, '36.2'),
-            (1, '36.2.1'), (1, '36.2.2'), (1, '36.2.3'),
-
+            (1, '36.2.1'),
+            (1, '36.2.2'),
+            (1, '36.2.3'),
+            (1, '36.2.4'), (1, '36.2.4.1'),
 
 
     (1, '100'),

+ 8 - 0
src/main/java/com/backendsys/modules/TestController.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 
 import com.backendsys.aspect.RateLimiting;
 import com.backendsys.aspect.QueuingPoll;
+import com.backendsys.modules.common.config.security.utils.HttpRequestUtil;
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.sdk.baidu.yunapp.entity.ExecuteScriptParams;
 import com.backendsys.modules.sdk.baidu.yunapp.service.YunappService;
@@ -72,6 +73,9 @@ public class TestController {
     @Value("${tencent.facefusion.secret-key}")
     private String SECRET_KEY;
 
+    @Autowired
+    private HttpRequestUtil httpRequestUtil;
+
 
 //    @Autowired
 //    private DeepSeekClientImpl deepSeekClient;
@@ -105,6 +109,10 @@ public class TestController {
 //        return deepSeekClient.chatFluxCompletion(request);
 //    }
 
+    @GetMapping("/getCurrentIP")
+    public String getCurrentIP() {
+        return httpRequestUtil.getIpAddr();
+    }
 
     @Autowired
     private ServletContext servletContext;

+ 8 - 2
src/main/java/com/backendsys/modules/crt/controller/CrtDramaProjectStoryboardController.java

@@ -38,14 +38,20 @@ public class CrtDramaProjectStoryboardController {
         return Result.success().put("data", crtDramaProjectStoryboardService.createStoryboard(crtDramaProject));
     }
 
-    @Operation(summary = "编辑分镜配置")
+    @Operation(summary = "编辑生图/生视频配置")
     @PreAuthorize("@sr.hasPermission('36.2.3')")
     @PutMapping("/api/crt/drama/updateStoryboardSettings")
     public Result updateStoryboardSettings(@Validated(CrtDramaProjectSettings.UpdateSettings.class) @RequestBody CrtDramaProjectSettings crtDramaProjectSettings) {
         return Result.success().put("data", crtDramaProjectStoryboardService.updateStoryboardSettings(crtDramaProjectSettings));
     }
 
-
+    @Operation(summary = "编辑分镜")
+//    @PreAuthorize("@sr.hasPermission('36.2.4')")
+    @PostMapping("/api/crt/drama/updateStoryboard")
+    public Result updateStoryboard(@Validated(CrtDramaProjectStoryboard.Update.class) @RequestBody CrtDramaProjectStoryboard crtDramaProjectStoryboard) {
+        crtDramaProjectStoryboard.setUser_id(SecurityUtil.getUserId());
+        return Result.success().put("data", crtDramaProjectStoryboardService.updateStoryboard(crtDramaProjectStoryboard));
+    }
 
 
 

+ 1 - 0
src/main/java/com/backendsys/modules/crt/entity/CrtDramaProjectStoryboard.java

@@ -17,6 +17,7 @@ public class CrtDramaProjectStoryboard {
     public static interface Delete{}
 
     @TableId(type = IdType.AUTO)
+    @NotNull(message = "分镜ID不能为空", groups = { Update.class })
     private Long id;
 
     private Long user_id;

+ 4 - 1
src/main/java/com/backendsys/modules/crt/service/CrtDramaProjectStoryboardService.java

@@ -16,7 +16,10 @@ public interface CrtDramaProjectStoryboardService {
     // 创建分镜
     Map<String, Object> createStoryboard(CrtDramaProject crtDramaProject);
 
-    // 编辑分镜配置
+    // 编辑生图/生视频配置
     Map<String, Object> updateStoryboardSettings(CrtDramaProjectSettings crtDramaProjectSettings);
 
+    // 编辑分镜
+    Map<String, Object> updateStoryboard(CrtDramaProjectStoryboard crtDramaProjectStoryboard);
+
 }

+ 10 - 0
src/main/java/com/backendsys/modules/crt/service/impl/CrtDramaProjectServiceImpl.java

@@ -77,9 +77,19 @@ public class CrtDramaProjectServiceImpl implements CrtDramaProjectService {
     @Override
     public Map<String, Object> updateCrtDramaProject(CrtDramaProject crtDramaProject) {
 
+
+
+
+
+        // 有问题,还要判断自己是否具备 36.1.4.1 权限呢
+
         // 判断项目是否存在,并且是否具备操作权限
         crtUtil.checkProject(crtDramaProject.getDrama_project_id(), "36.1.4");
 
+
+
+
+
         // [DB] 更新项目
         crtDramaProjectDao.update(crtDramaProject, new LambdaQueryWrapper<CrtDramaProject>()
                 .eq(CrtDramaProject::getId, crtDramaProject.getDrama_project_id()));

+ 13 - 1
src/main/java/com/backendsys/modules/crt/service/impl/CrtDramaProjectStoryboardServiceImpl.java

@@ -111,7 +111,7 @@ public class CrtDramaProjectStoryboardServiceImpl implements CrtDramaProjectStor
 
 
     /**
-     * 编辑分镜配置
+     * 编辑生图/生视频配置
      */
     @Override
     public Map<String, Object> updateStoryboardSettings(CrtDramaProjectSettings crtDramaProjectSettings) {
@@ -142,4 +142,16 @@ public class CrtDramaProjectStoryboardServiceImpl implements CrtDramaProjectStor
         return Map.of("drama_project_id", crtDramaProjectSettings.getDrama_project_id());
     }
 
+
+    /**
+     * 编辑分镜
+     */
+    @Override
+    public Map<String, Object> updateStoryboard(CrtDramaProjectStoryboard crtDramaProjectStoryboard) {
+
+
+
+        return Map.of("id", crtDramaProjectStoryboard.getId());
+    }
+
 }