diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb index bf4adc1c..4b6fe2c9 100644 --- a/data_base_design/天泽数据大平台.pdb +++ b/data_base_design/天泽数据大平台.pdb @@ -1,5 +1,5 @@ - + @@ -6563,9 +6563,9 @@ LABL 0 新宋体,8,N 1667489810 -1667577198 +1667577912 -1 -((415022,2529), (439740,12425)) +((414966,-771), (440096,10925)) 12615680 16570034 12632256 @@ -19347,8 +19347,8 @@ COLLATE = utf8_general_ci teacher_open_course_merge_resources_info 1563157584 lx -1667530830 -lx +1667577974 +87966 开课关联- 资源管理-离线 auto_increment = 1 ENGINE = InnoDB @@ -19424,22 +19424,23 @@ COLLATE = utf8_general_ci resources_info_content 1623841464 lx -1667489810 -lx +1667577974 +87966 资源内容 -varchar(255) -255 +varchar(4000) +4000 -F6ACE349-86F0-4A59-90C0-5D89F9C43777 -org_id -org_id -1622257950 -lx -1667489810 -lx -组织机构ID -bigint +62640640-6A94-460E-B784-074E5A40B789 +resources_info_files +resources_info_files +1667577916 +87966 +1667577974 +87966 +资源文件集合 +varchar(4000) +4000 DF0255D5-A8C9-43E8-9D9E-0DDFA19DFE5E @@ -19452,9 +19453,31 @@ COLLATE = utf8_general_ci 后台用户ID bigint + +F6ACE349-86F0-4A59-90C0-5D89F9C43777 +org_id +org_id +1622257950 +lx +1667489810 +lx +组织机构ID +bigint + + +21F5F058-AF92-4F55-B666-3DF75CF77936 +order_index +order_index +1667577916 +87966 +1667577974 +87966 +资源排序 +bigint + - + C2FA3921-165F-4542-BF1B-D74C6C833D9B Key_1 Key_1 @@ -19468,7 +19491,7 @@ COLLATE = utf8_general_ci - + @@ -19486,7 +19509,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 56465247-51F8-416A-AEFD-714542E9B63D id id @@ -19502,7 +19525,7 @@ COLLATE = utf8_general_ci - + DF818B83-40D4-4080-9E3F-98491EA22EB2 method method @@ -19514,7 +19537,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 7C08961B-D182-4228-AEC8-2AEBEFEF71C4 request_url request_url @@ -19526,7 +19549,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + F0F132B4-57B4-479B-9CD1-9F5905CD2601 params params @@ -19538,7 +19561,7 @@ COLLATE = utf8_general_ci varchar(5000) 5000 - + 66D52CA7-15B6-4DCA-AA5B-219B0CEADDEB result result @@ -19552,7 +19575,7 @@ COLLATE = utf8_general_ci - + 37390514-F792-4EBB-A521-C2658EBA5347 ip ip @@ -19564,7 +19587,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + 9D42C096-6C91-443C-A5F4-40A28415C755 create_time create_time @@ -19575,7 +19598,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 574D853B-7D8A-4423-99E1-906478E34CB2 result_time result_time @@ -19586,7 +19609,7 @@ COLLATE = utf8_general_ci 响应时间 datetime - + ACF5FB8B-B673-49F3-AE69-29688243F55D token token @@ -19598,7 +19621,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + D25040D0-B768-4E68-BFA8-FFCFE2CED70D student_id student_id @@ -19609,7 +19632,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 7869AAF1-7013-450F-86E1-5AA5E0E07A81 session session @@ -19621,7 +19644,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + D776ED49-FA3F-472A-BDDC-FA294ED32EB9 user_id user_id @@ -19632,7 +19655,7 @@ COLLATE = utf8_general_ci 管理员或教师ID bigint - + DC875B01-3F9E-4C9D-B253-30457968AD50 open_id open_id @@ -19646,7 +19669,7 @@ COLLATE = utf8_general_ci - + 7D6196D6-D9F5-4F30-886C-8F0F2D1AA50B Key_1 Key_1 @@ -19655,17 +19678,17 @@ COLLATE = utf8_general_ci 1667535250 lx - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -19676,7 +19699,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -19951,7 +19974,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm index bf4adc1c..99f145ee 100644 --- a/data_base_design/天泽数据大平台.pdm +++ b/data_base_design/天泽数据大平台.pdm @@ -1,5 +1,5 @@ - + @@ -6563,9 +6563,9 @@ LABL 0 新宋体,8,N 1667489810 -1667577198 +1667577912 -1 -((415022,2529), (439740,12425)) +((414966,-771), (440096,10925)) 12615680 16570034 12632256 @@ -19347,8 +19347,8 @@ COLLATE = utf8_general_ci teacher_open_course_merge_resources_info 1563157584 lx -1667530830 -lx +1667578189 +87966 开课关联- 资源管理-离线 auto_increment = 1 ENGINE = InnoDB @@ -19424,24 +19424,36 @@ COLLATE = utf8_general_ci resources_info_content 1623841464 lx -1667489810 -lx +1667577974 +87966 资源内容 -varchar(255) -255 +varchar(4000) +4000 -F6ACE349-86F0-4A59-90C0-5D89F9C43777 -org_id -org_id -1622257950 -lx -1667489810 -lx -组织机构ID -bigint +62640640-6A94-460E-B784-074E5A40B789 +resources_info_files +resources_info_files +1667577916 +87966 +1667577974 +87966 +资源文件集合 +varchar(4000) +4000 +21F5F058-AF92-4F55-B666-3DF75CF77936 +order_index +order_index +1667577916 +87966 +1667577974 +87966 +资源排序 +bigint + + DF0255D5-A8C9-43E8-9D9E-0DDFA19DFE5E user_id user_id @@ -19452,9 +19464,20 @@ COLLATE = utf8_general_ci 后台用户ID bigint + +F6ACE349-86F0-4A59-90C0-5D89F9C43777 +org_id +org_id +1622257950 +lx +1667489810 +lx +组织机构ID +bigint + - + C2FA3921-165F-4542-BF1B-D74C6C833D9B Key_1 Key_1 @@ -19468,7 +19491,7 @@ COLLATE = utf8_general_ci - + @@ -19486,7 +19509,7 @@ DEFAULT CHARACTER SET = utf8 COLLATE = utf8_general_ci - + 56465247-51F8-416A-AEFD-714542E9B63D id id @@ -19502,7 +19525,7 @@ COLLATE = utf8_general_ci - + DF818B83-40D4-4080-9E3F-98491EA22EB2 method method @@ -19514,7 +19537,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + 7C08961B-D182-4228-AEC8-2AEBEFEF71C4 request_url request_url @@ -19526,7 +19549,7 @@ COLLATE = utf8_general_ci varchar(1000) 1000 - + F0F132B4-57B4-479B-9CD1-9F5905CD2601 params params @@ -19538,7 +19561,7 @@ COLLATE = utf8_general_ci varchar(5000) 5000 - + 66D52CA7-15B6-4DCA-AA5B-219B0CEADDEB result result @@ -19552,7 +19575,7 @@ COLLATE = utf8_general_ci - + 37390514-F792-4EBB-A521-C2658EBA5347 ip ip @@ -19564,7 +19587,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + 9D42C096-6C91-443C-A5F4-40A28415C755 create_time create_time @@ -19575,7 +19598,7 @@ COLLATE = utf8_general_ci 创建时间 datetime - + 574D853B-7D8A-4423-99E1-906478E34CB2 result_time result_time @@ -19586,7 +19609,7 @@ COLLATE = utf8_general_ci 响应时间 datetime - + ACF5FB8B-B673-49F3-AE69-29688243F55D token token @@ -19598,7 +19621,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + D25040D0-B768-4E68-BFA8-FFCFE2CED70D student_id student_id @@ -19609,7 +19632,7 @@ COLLATE = utf8_general_ci 学生ID bigint - + 7869AAF1-7013-450F-86E1-5AA5E0E07A81 session session @@ -19621,7 +19644,7 @@ COLLATE = utf8_general_ci varchar(255) 255 - + D776ED49-FA3F-472A-BDDC-FA294ED32EB9 user_id user_id @@ -19632,7 +19655,7 @@ COLLATE = utf8_general_ci 管理员或教师ID bigint - + DC875B01-3F9E-4C9D-B253-30457968AD50 open_id open_id @@ -19646,7 +19669,7 @@ COLLATE = utf8_general_ci - + 7D6196D6-D9F5-4F30-886C-8F0F2D1AA50B Key_1 Key_1 @@ -19655,17 +19678,17 @@ COLLATE = utf8_general_ci 1667535250 lx - + - + - + BFEA4109-96F9-4074-AF58-B84D6574A7FC PUBLIC PUBLIC @@ -19676,7 +19699,7 @@ COLLATE = utf8_general_ci - + ABEFC813-1056-4507-A9A7-809C149B4ABE 1661954753 lx @@ -19951,7 +19974,7 @@ COLLATE = utf8_general_ci - + 5963E417-B2CE-431D-988A-B3493AAE5EE4 MySQL 5.0 MYSQL50 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java index 01e59d10..a53fa94b 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesInfo.java @@ -41,6 +41,10 @@ public class ResourcesInfo extends BaseEntity{ private String resourcesInfoFiles; + // 资源排序 + + private String orderIndex; + //组织机构ID private Long orgId ; @@ -146,4 +150,12 @@ public class ResourcesInfo extends BaseEntity{ public void setResourcesInfoFiles(String resourcesInfoFiles) { this.resourcesInfoFiles = resourcesInfoFiles; } + + public String getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(String orderIndex) { + this.orderIndex = orderIndex; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java index fd96f3b6..3babb5bf 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java @@ -47,6 +47,10 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ private String resourcesInfoFiles; + // 资源排序 + + private String orderIndex; + //组织机构ID private Long orgId ; @@ -165,4 +169,12 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ public void setResourcesInfoFiles(String resourcesInfoFiles) { this.resourcesInfoFiles = resourcesInfoFiles; } + + public String getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(String orderIndex) { + this.orderIndex = orderIndex; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java index 085c7a7d..a5314bb6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java @@ -24,6 +24,8 @@ public class ResourcesInfoQuery extends PageParam { @Query(name = "资源内容", display = false) private String resourcesInfoFiles; + @Query(name = "资源排序", display = false) + private String orderIndex; @Query(name = "组织机构ID", display = false) private Long orgId; @Query(name = "后台用户ID", display = false) @@ -84,6 +86,7 @@ public class ResourcesInfoQuery extends PageParam { pojo.setResourcesInfoType(this.getResourcesInfoType()); pojo.setResourcesInfoContent(this.getResourcesInfoContent()); pojo.setResourcesInfoFiles(this.getResourcesInfoFiles()); + pojo.setOrderIndex(this.getOrderIndex()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo; @@ -113,4 +116,12 @@ public class ResourcesInfoQuery extends PageParam { public void setResourcesInfoFiles(String resourcesInfoFiles) { this.resourcesInfoFiles = resourcesInfoFiles; } + + public String getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(String orderIndex) { + this.orderIndex = orderIndex; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java index 8376bac0..f92c9f81 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java @@ -26,6 +26,8 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam { private String resourcesInfoContent; @Query(name = "资源内容", display = false) private String resourcesInfoFiles; + @Query(name = "资源内容", display = false) + private String orderIndex; @Query(name = "组织机构ID", display = false) private Long orgId; @Query(name = "后台用户ID", display = false) @@ -93,6 +95,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam { pojo.setResourcesInfoType(this.getResourcesInfoType()); pojo.setResourcesInfoContent(this.getResourcesInfoContent()); pojo.setResourcesInfoFiles(this.getResourcesInfoFiles()); + pojo.setOrderIndex(this.getOrderIndex()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo; @@ -158,4 +161,12 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam { public void setResourcesInfoFiles(String resourcesInfoFiles) { this.resourcesInfoFiles = resourcesInfoFiles; } + + public String getOrderIndex() { + return orderIndex; + } + + public void setOrderIndex(String orderIndex) { + this.orderIndex = orderIndex; + } }