完成短剧创作项目的列表接口及权限

db/crt_drama_project.sql

@@ -20,5 +20,15 @@ CREATE TABLE `crt_drama_project` (
 
 INSERT INTO crt_drama_project(user_id, project_name, crt_drama_lora_style_id, crt_drama_lora_character_ids) VALUES
     (1, '测试项目', null, null),
-    (1, '我的仙狐娘娘', 1, '1,2')
+    (1, '我的仙狐娘娘', 1, '1,2'),
+    (1, '数量测试项目3', null, null),
+    (1, '数量测试项目4', null, null),
+    (1, '数量测试项目5', null, null),
+    (1, '数量测试项目6', null, null),
+    (1, '数量测试项目7', null, null),
+    (1, '数量测试项目8', null, null),
+    (1, '数量测试项目9', null, null),
+    (1, '数量测试项目10', null, null),
+    (1, '数量测试项目11', null, null),
+    (1, '数量测试项目12', null, null)
 ;

db/sys_user_role_permission.sql

@@ -36,6 +36,13 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
     ('35', -1, 'AI模特', 7),
         ('35.1', '35', 'AI模特-运营权限', null),
 
+    ('36', -1, 'AI短剧创作', 8),
+        ('36.1', '36', 'AI短剧创作-项目管理', null),
+            ('36.1.1', '36.1', 'AI短剧创作-项目列表 (全部)', null),
+            ('36.1.2', '36.1', 'AI短剧创作-项目列表 (自己)', null),
+
+
+
     ('3', -1, '系统用户管理', 900),
         ('3.1', '3', '系统用户列表 (在线的)', null),
         ('3.2', '3', '系统用户列表', null),
@@ -117,7 +124,7 @@ INSERT INTO sys_user_role_permission(id, parent_id, permission_name, sort) VALUE
             ('10.6.1', '10.6', '导航详情', null),
             ('10.6.2', '10.6', '创建导航', null),
             ('10.6.3', '10.6', '编辑导航', null),
-            ('10.6.4', '10.6', '删除导航', null),
+            ('10.6.4', '10.6', '删除导航', null)
 
     -- ('11', -1, '商品管理', null),
     --     ('11.1', '11', '商品列表', null),

db/sys_user_role_permission_relation.sql

@@ -99,6 +99,12 @@ INSERT INTO sys_user_role_permission_relation(role_id, permission_id) VALUES
     (1, '35'),
         (1, '35.1'),
 
+    (1, '36'),
+        (1, '36.1'),
+            (1, '36.1.1'),
+            (1, '36.1.2'),
+
+
 
     (1, '100'),
         (1, '101'),

src/main/java/com/backendsys/modules/common/config/security/utils/SecurityUtil.java

@@ -36,6 +36,7 @@ import java.util.List;
  * 权限注解
  * @PreAuthorize("@sr.hasPermission('3.2.1')")
  * @PreAuthorize("@sr.hasPermissions(T(java.util.Arrays).asList('3.2.1', '3.2.2'))")
+ * @PreAuthorize("@sr.hasPermissions(T(java.util.Arrays).asList('3.2.1', '3.2.2'), T(com.backendsys.modules.common.enums.MatchType).OR)")
  */
 @Service("sr")
 public class SecurityUtil {

src/main/java/com/backendsys/modules/crt/controller/CrtDramaProjectController.java

@@ -21,8 +21,16 @@ public class CrtDramaProjectController {
     @Autowired
     private CrtDramaProjectService crtDramaProjectService;
 
+
+    @Operation(summary = "获取短剧创作-项目列表 (全部)")
+    @PreAuthorize("@sr.hasPermission('36.1.1')")
+    @GetMapping("/api/crt/drama/getDramaProjectAllList")
+    public Result getDramaProjectAllList(@Validated CrtDramaProject crtDramaProject) {
+        return Result.success().put("data", crtDramaProjectService.selectCrtDramaProjectList(crtDramaProject));
+    }
+
     @Operation(summary = "获取短剧创作-项目列表 (我的)")
-//    @PreAuthorize("@sr.hasPermission('10')")
+    @PreAuthorize("@sr.hasPermissions(T(java.util.Arrays).asList('36.1.1', '36.1.2'), T(com.backendsys.modules.common.enums.MatchType).OR)")
     @GetMapping("/api/crt/drama/getDramaProjectList")
     public Result getDramaProjectList(@Validated CrtDramaProject crtDramaProject) {
         crtDramaProject.setUser_id(SecurityUtil.getUserId());

src/main/resources/mapper/crt/drama/CrtDramaProjectDao.xml

@@ -16,9 +16,8 @@
         <id property="id" column="id" jdbcType="BIGINT" />
         <result property="user_id" column="user_id" javaType="java.lang.Long" />
         <result property="project_name" column="project_name" />
-<!--        <result property="storyboard_episode_nums" column="storyboard_episode_nums" javaType="java.lang.String" />-->
-        <result property="storyboard_episode_nums" column="storyboard_episode_nums" javaType="java.util.List" jdbcType="VARCHAR"
-                typeHandler="com.backendsys.config.Mybatis.handler.StringToListTypeHandler" />
+        <result property="storyboard_episode_nums" column="storyboard_episode_nums" javaType="java.util.List"
+                jdbcType="VARCHAR" typeHandler="com.backendsys.config.Mybatis.handler.StringToListTypeHandler" />
         <result property="crt_drama_lora_style_id" column="crt_drama_lora_style_id" javaType="java.lang.Long" />
         <result property="crt_drama_lora_character_ids" column="crt_drama_lora_character_ids" />
         <result property="create_time" column="create_time" />