tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 0748cf8a86
commit b5c6e3268e
5 changed files with 1534 additions and 1394 deletions
Show Stats Download Patch File Download Diff File

2845
data_base_design/天泽数据大平台.pdb
View File

File diff suppressed because it is too large Load Diff

61
data_base_design/天泽数据大平台.pdm
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1671615210" Name="cjks" Objects="1377" Symbols="106" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1671701065" Name="cjks" Objects="1359" Symbols="105" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@ -4688,7 +4688,7 @@ Shadow=0</a:DisplayPreferences>
<a:CreationDate>1623769194</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-9459,50726), (6463,66922))</a:Rect>
<a:Rect>((-9120,50726), (6124,66922))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4713,7 +4713,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-9331,10954), (6591,26250))</a:Rect>
<a:Rect>((-8992,10954), (6252,26250))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4765,7 +4765,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-9283,-14307), (6639,89))</a:Rect>
<a:Rect>((-8944,-14307), (6300,89))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4844,7 +4844,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623826338</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((40688,49404), (68722,57500))</a:Rect>
<a:Rect>((41315,49404), (68095,57500))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4869,7 +4869,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((8540,1660), (34844,17856))</a:Rect>
<a:Rect>((9126,1660), (34258,17856))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4894,7 +4894,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((10906,-10357), (31586,-461))</a:Rect>
<a:Rect>((11358,-10357), (31134,-461))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4919,7 +4919,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((10673,-24326), (31353,-14430))</a:Rect>
<a:Rect>((11125,-24326), (30901,-14430))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4944,7 +4944,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((8158,-37956), (34462,-27160))</a:Rect>
<a:Rect>((8744,-37956), (33876,-27160))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4969,7 +4969,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((14533,18471), (33915,35567))</a:Rect>
<a:Rect>((14954,18471), (33494,35567))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4994,7 +4994,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1669343782</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37640,-24084), (54860,-9688))</a:Rect>
<a:Rect>((38010,-24084), (54490,-9688))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5019,7 +5019,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37517,-38713), (54737,-24317))</a:Rect>
<a:Rect>((37887,-38713), (54367,-24317))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5373,7 +5373,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57397,-26488), (70291,-14792))</a:Rect>
<a:Rect>((57664,-26488), (70024,-14792))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5398,7 +5398,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-37002,-12538), (-9400,958))</a:Rect>
<a:Rect>((-36385,-12538), (-10017,958))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5423,7 +5423,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-43569,-23338), (-30675,-14342))</a:Rect>
<a:Rect>((-43302,-23338), (-30942,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5448,7 +5448,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29673,-23338), (-9857,-14342))</a:Rect>
<a:Rect>((-29241,-23338), (-10289,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5473,7 +5473,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-57383,-23188), (-44489,-14192))</a:Rect>
<a:Rect>((-57116,-23188), (-44756,-14192))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5498,7 +5498,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42339,28637), (66913,46633))</a:Rect>
<a:Rect>((42884,28637), (66368,46633))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5548,7 +5548,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42778,-32668), (-31614,-25472))</a:Rect>
<a:Rect>((-42552,-32668), (-31840,-25472))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5573,7 +5573,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-30095,-35818), (-9847,-24122))</a:Rect>
<a:Rect>((-29653,-35818), (-10289,-24122))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5598,7 +5598,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37596,20648), (49954,26044))</a:Rect>
<a:Rect>((37876,20648), (49674,26044))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5623,7 +5623,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7690,-35277), (4338,-26281))</a:Rect>
<a:Rect>((-7444,-35277), (4092,-26281))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5648,7 +5648,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7615,-23577), (4413,-15481))</a:Rect>
<a:Rect>((-7369,-23577), (4167,-15481))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6467,7 +6467,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666665914</a:CreationDate>
<a:ModificationDate>1670252245</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((415069,31232), (441373,48328))</a:Rect>
<a:Rect>((415655,31232), (440787,48328))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6492,7 +6492,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1666667664</a:CreationDate>
<a:ModificationDate>1670252245</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((414795,12091), (439369,30987))</a:Rect>
<a:Rect>((415340,12091), (438824,30987))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6571,7 +6571,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667489810</a:CreationDate>
<a:ModificationDate>1670252245</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((414379,-771), (440683,10925))</a:Rect>
<a:Rect>((414965,-771), (440097,10925))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6596,7 +6596,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1667535250</a:CreationDate>
<a:ModificationDate>1671615210</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57066,-41413), (72122,-27017))</a:Rect>
<a:Rect>((57384,-41413), (71804,-27017))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6778,7 +6778,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1670998074</a:CreationDate>
<a:ModificationDate>1670998076</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((445379,36960), (463463,47756))</a:Rect>
<a:Rect>((445769,36960), (463073,47756))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -19516,10 +19516,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>order_index</a:Code>
<a:CreationDate>1667577916</a:CreationDate>
<a:Creator>87966</a:Creator>
<a:ModificationDate>1667577974</a:ModificationDate>
<a:ModificationDate>1671701065</a:ModificationDate>
<a:Modifier>87966</a:Modifier>
<a:Comment>资源排序</a:Comment>
<a:DataType>bigint</a:DataType>
<a:DataType>int(10)</a:DataType>
<a:Length>10</a:Length>
</o:Column>
<o:Column Id="o1164">
<a:ObjectID>DF0255D5-A8C9-43E8-9D9E-0DDFA19DFE5E</a:ObjectID>

6
web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
Unescape Escape View File

@ -55,7 +55,7 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
// 资源排序
private String orderIndex;
private Integer orderIndex;
//组织机构ID
@ -176,11 +176,11 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
this.resourcesInfoFiles = resourcesInfoFiles;
}
public String getOrderIndex() {
public Integer getOrderIndex() {
return orderIndex;
}
public void setOrderIndex(String orderIndex) {
public void setOrderIndex(Integer orderIndex) {
this.orderIndex = orderIndex;
}

10
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
Unescape Escape View File

@ -928,9 +928,15 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
List<Tree<String>> build = TreeUtil.build(courseInfoList, "0", defaultConfig, ((courseInfo, treeNode) -> {
Long courseInfoId = courseInfo.getTeacherOpenCourseMergeCourseInfoId();
// 找到这个课程章节ID下，的资源
// 找到这个课程章节ID下的资源,并排序
List<TeacherOpenCourseMergeResourcesInfo> filteredResourcesInfoList = resourcesInfoCopyOnWriteArrayList.stream()
.filter(it -> it.getTeacherOpenCourseMergeCourseInfoId().equals(courseInfoId)).collect(Collectors.toList());
.filter(it -> it.getTeacherOpenCourseMergeCourseInfoId().equals(courseInfoId))
.sorted((o1, o2) -> {
if (ObjectUtil.isAllNotEmpty(o1.getOrderIndex(), o2.getOrderIndex())) {
return o2.getOrderIndex().compareTo(o1.getOrderIndex());
}
return 0;
}).collect(Collectors.toList());
// 获取课程ids
String courseInfoIds = filteredResourcesInfoList.stream().map(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeCourseInfoId)

6
web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
Unescape Escape View File

@ -31,7 +31,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen
@Query(name = "资源文件", display = false)
private String resourcesInfoFiles;
@Query(name = "资源排序", display = false)
private String orderIndex;
private Integer orderIndex;
// 资源状态 0删除 1上架 2下架
private GlobalUpStatusEnum resourcesInfoStatus;
@Query(name = "组织机构ID", display = false)
@ -169,11 +169,11 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam implemen
this.resourcesInfoFiles = resourcesInfoFiles;
}
public String getOrderIndex() {
public Integer getOrderIndex() {
return orderIndex;
}
public void setOrderIndex(String orderIndex) {
public void setOrderIndex(Integer orderIndex) {
this.orderIndex = orderIndex;
}

Write Preview
Loading…
Cancel
Save