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

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent 948916839b e68680326f
commit 0caddf913b
4 changed files with 242 additions and 137 deletions
Show Stats Download Patch File Download Diff File

4
data_base_design/天泽数据大平台.pdb
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="1666667743" Name="cjks" Objects="1210" Symbols="92" 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="1666667754" Name="cjks" Objects="1210" Symbols="92" 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">
@ -18563,7 +18563,7 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
<a:Code>teacher_open_course_merge_course_info_id</a:Code>
<a:CreationDate>1623836619</a:CreationDate>
<a:Creator>lx</a:Creator>
<a:ModificationDate>1666667647</a:ModificationDate>
<a:ModificationDate>1666667754</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>课程ID</a:Comment>
<a:DataType>bigint</a:DataType>

80
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="1666667754" Name="cjks" Objects="1210" Symbols="92" 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="1666750850" Name="cjks" Objects="1167" Symbols="92" 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">
@ -4657,7 +4657,7 @@ Shadow=0</a:DisplayPreferences>
<a:CreationDate>1623769194</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8695,51363), (5699,66285))</a:Rect>
<a:Rect>((-9119,50726), (6123,66922))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4682,7 +4682,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623769937</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8567,11553), (5827,25651))</a:Rect>
<a:Rect>((-8991,10954), (6251,26250))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4734,7 +4734,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623770338</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-8519,-13745), (5875,-473))</a:Rect>
<a:Rect>((-8943,-14307), (6299,89))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4813,7 +4813,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623826338</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((42101,49703), (67309,57201))</a:Rect>
<a:Rect>((41316,49404), (68094,57500))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4838,7 +4838,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828456</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9860,2297), (33524,17219))</a:Rect>
<a:Rect>((9127,1660), (34257,17856))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4863,7 +4863,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828633</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11925,-9983), (30567,-835))</a:Rect>
<a:Rect>((11359,-10357), (31133,-461))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4888,7 +4888,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828682</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((11692,-23952), (30334,-14804))</a:Rect>
<a:Rect>((11126,-24326), (30900,-14430))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4913,7 +4913,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828725</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((9671,-36719), (32949,-28397))</a:Rect>
<a:Rect>((8951,-37056), (33669,-28060))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4938,7 +4938,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623828770</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((15675,19145), (32773,34893))</a:Rect>
<a:Rect>((14955,18471), (33493,35567))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4963,7 +4963,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623840859</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((33274,-11672), (48826,1600))</a:Rect>
<a:Rect>((32811,-12234), (49289,2162))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -4988,7 +4988,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623841366</a:CreationDate>
<a:ModificationDate>1661907266</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((33151,-26301), (48703,-13029))</a:Rect>
<a:Rect>((32688,-26863), (49166,-12467))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5013,7 +5013,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623842834</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((73515,34605), (94861,71803))</a:Rect>
<a:Rect>((72859,32956), (95517,73452))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5038,7 +5038,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845173</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97714,50128), (123308,65876))</a:Rect>
<a:Rect>((96916,49454), (124106,66550))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5063,7 +5063,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623845296</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((97012,38528), (114110,47676))</a:Rect>
<a:Rect>((96498,38154), (114624,48050))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5088,7 +5088,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859429</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126351,49974), (150015,66546))</a:Rect>
<a:Rect>((125618,49262), (150748,67258))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5113,7 +5113,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623859834</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((126448,37699), (145090,47671))</a:Rect>
<a:Rect>((125882,37287), (145656,48083))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5165,7 +5165,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860248</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((74612,-8114), (93640,7634))</a:Rect>
<a:Rect>((74033,-8788), (94219,8308))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5190,7 +5190,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623860509</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((95518,-7901), (110684,7021))</a:Rect>
<a:Rect>((95068,-8538), (111134,7658))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5215,7 +5215,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861067</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((114819,9099), (138483,25671))</a:Rect>
<a:Rect>((114086,8387), (139216,26383))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5240,7 +5240,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861149</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117630,-4251), (136272,5721))</a:Rect>
<a:Rect>((117064,-4663), (136838,6133))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5290,7 +5290,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623861290</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((117330,-17151), (135972,-7179))</a:Rect>
<a:Rect>((116764,-17563), (136538,-6767))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5342,7 +5342,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862594</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((57999,-26039), (69689,-15241))</a:Rect>
<a:Rect>((57665,-26488), (70023,-14792))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5367,7 +5367,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623862978</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-35612,-12014), (-10790,434))</a:Rect>
<a:Rect>((-36384,-12538), (-10018,958))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5392,7 +5392,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623863676</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42967,-23001), (-31277,-14679))</a:Rect>
<a:Rect>((-43301,-23338), (-30943,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5417,7 +5417,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623864141</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-28700,-23001), (-10830,-14679))</a:Rect>
<a:Rect>((-29240,-23338), (-10290,-14342))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5442,7 +5442,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1623895431</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-56781,-22851), (-45091,-14529))</a:Rect>
<a:Rect>((-57115,-23188), (-44757,-14192))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5467,7 +5467,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1625926250</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((43567,29349), (65685,45921))</a:Rect>
<a:Rect>((42885,28637), (66367,46633))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5492,7 +5492,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1627129933</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((98192,67576), (113358,74248))</a:Rect>
<a:Rect>((97742,67314), (113808,74510))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5517,7 +5517,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307450</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-42268,-32406), (-32124,-25734))</a:Rect>
<a:Rect>((-42551,-32668), (-31841,-25472))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5542,7 +5542,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628307767</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-29099,-35369), (-10843,-24571))</a:Rect>
<a:Rect>((-29652,-35818), (-10290,-24122))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5567,7 +5567,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1628340137</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((38226,20835), (49324,25857))</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>
@ -5592,7 +5592,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631242896</a:CreationDate>
<a:ModificationDate>1666620820</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7135,-34940), (3783,-26618))</a:Rect>
<a:Rect>((-7443,-35277), (4091,-26281))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -5617,7 +5617,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1631243538</a:CreationDate>
<a:ModificationDate>1662650462</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-7060,-23278), (3858,-15780))</a:Rect>
<a:Rect>((-7368,-23577), (4166,-15481))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -6284,7 +6284,7 @@ LABL 0 新宋体,8,N</a:FontList>
<a:CreationDate>1663937886</a:CreationDate>
<a:ModificationDate>1666098792</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((37768,3676), (61432,19424))</a:Rect>
<a:Rect>((37035,3002), (62165,20098))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@ -8391,15 +8391,15 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
</o:Column>
<o:Column Id="o331">
<a:ObjectID>C9BE0024-F028-454E-85E5-8B86F60D52E1</a:ObjectID>
<a:Name>application_carousel_map</a:Name>
<a:Name>application_carousel</a:Name>
<a:Code>application_carousel</a:Code>
<a:CreationDate>1623841644</a:CreationDate>
<a:Creator>Administrator</a:Creator>
<a:ModificationDate>1623842716</a:ModificationDate>
<a:Modifier>Administrator</a:Modifier>
<a:ModificationDate>1666750850</a:ModificationDate>
<a:Modifier>lx</a:Modifier>
<a:Comment>轮播图(多个，逗号隔开)</a:Comment>
<a:DataType>varchar(255)</a:DataType>
<a:Length>255</a:Length>
<a:DataType>varchar(4000)</a:DataType>
<a:Length>4000</a:Length>
</o:Column>
<o:Column Id="o332">
<a:ObjectID>3E577E7B-DDB8-42A7-83D5-22CF661484F7</a:ObjectID>

4
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseNoticeService.java
Unescape Escape View File

@ -124,7 +124,9 @@ public class TeacherOpenCourseNoticeService extends CoreBaseService<TeacherOpenC
}
public List<TeacherOpenCourseNotice> getValuesByQuery (TeacherOpenCourseNoticeQuery teacherOpenCourseNoticeQuery){
return teacherOpenCourseNoticeDao.getValuesByQuery(teacherOpenCourseNoticeQuery);
List<TeacherOpenCourseNotice> noticeList = teacherOpenCourseNoticeDao.getValuesByQuery(teacherOpenCourseNoticeQuery);
queryListAfter(noticeList);
return noticeList;
}
public TeacherOpenCourseNotice getInfo (Long teacherOpenCourseNoticeId){

291
web/src/main/java/com/ibeetl/jlw/web/IndexController.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.Interceptor.TStudent;
import cn.jlw.Interceptor.TTeacher;
import cn.jlw.token.TokenService;
import cn.jlw.util.EnumUtil;
import cn.jlw.util.ToolUtils;
import com.alibaba.fastjson.JSONObject;
import com.auth0.jwt.JWT;
@ -15,6 +16,7 @@ import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.ibeetl.admin.core.entity.CoreOrg;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.enums.MenuEnums;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.rbac.UserLoginInfo;
import com.ibeetl.admin.core.rbac.tree.MenuItem;
@ -24,6 +26,7 @@ import com.ibeetl.admin.core.util.TimeTool;
import com.ibeetl.admin.core.util.Tool;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.UniversitiesCollegesDao;
import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.service.*;
import com.ibeetl.jlw.web.query.CompetitionQuery;
@ -48,6 +51,7 @@ import java.util.*;
import static cn.jlw.Interceptor.AuthenticationInterceptor.getToken;
import static cn.jlw.Interceptor.AuthenticationInterceptor.indexTokenMap;
import static cn.jlw.token.TokenService.updateByIds;
import static com.ibeetl.admin.core.enums.MenuEnums.JT_S_02;
import static com.ibeetl.admin.core.service.CorePlatformService.tokenSessionMap;
@Controller
@ -87,6 +91,7 @@ public class IndexController {
private ResourcesApplicationService resourcesApplicationService;
@Autowired
private WebPlatformService webPlatformService;
private UniversitiesCollegesDao universitiesCollegesDao;
private final Log log = LogFactory.getLog(this.getClass());
@ -675,6 +680,124 @@ public class IndexController {
return view;
}
// @PostMapping("/login.json")
// @ResponseBody
// public JsonResult login(HttpServletRequest request, HttpServletResponse response,String code, String password, Integer type, Long typeId) {
// UniversitiesCollegesJurisdictionExperimentalSystem uSystem = new UniversitiesCollegesJurisdictionExperimentalSystem();
// uSystem.setType(type);
// uSystem.setTypeId(typeId);
// Cookie c1 = new Cookie("JSESSIONID", request.getSession().getId());
// c1.setPath("/");
// response.addCookie(c1);
// UserLoginInfo info = null;
// try {
// info = userService.login(code, password);
// }catch (Exception e){
// return JsonResult.failMessage(e.getMessage());
// }
// CoreUser user = info.getUser();
// CoreOrg currentOrg = info.getOrgs().get(0);
// for (CoreOrg org : info.getOrgs()) {
// if (org.getId().equals(user.getOrgId())) {
// currentOrg = org;
// break;
// }
// }
// info.setCurrentOrg(currentOrg);
//
// if(null != user && !Arrays.asList(JT_S_01.name(), JT_S_04.name()).contains(user.getJobType1())){//非管理员（包含学校管理员、超管）
//// if(null != type && null != typeId){
// UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(user.getOrgId());
// if(null != universitiesColleges && ((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())){
// uSystem.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
// uSystem.set("useTypes","1,2");
// List<UniversitiesCollegesJurisdictionExperimentalSystem>uSystemList = universitiesCollegesJurisdictionExperimentalSystemService.getValues(uSystem);
// if(null != uSystemList && uSystemList.size()>0){
// uSystem = uSystemList.get(0);
// }
// if(null != uSystem && null != uSystem.getUniversitiesCollegesJurisdictionExperimentalSystemId()){
// if(uSystem.getUseStartTime().getTime() <= System.currentTimeMillis() && uSystem.getUseEndTime().getTime() > System.currentTimeMillis()){
// String msg = "";
// if("JT_S_02".equals(user.getJobType1())){//如果是老师 快到期通知
// if(uSystem.getUseEndTime().getTime() - System.currentTimeMillis() < 259200000L){ //少于3天做通知
// msg = "请注意，系统即将过期";
// }
// }
//
// JsonResult jsonResult = new JsonResult();
// jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
// jsonResult.setMsg(msg);
//
// if(JT_S_02.equals(user.getJobType1())){//老师
// Teacher teacher = teacherService.getByUserId(user.getId());
// String token = tokenService.getToken(teacher);
//
// if(StringUtils.isNotBlank(token)){
//
// String keyId = UUID.randomUUID().toString();
// indexTokenMap.put(keyId,token);
// jsonResult.setData(keyId);
//
// //断token的尾巴
// if(StringUtils.isNotBlank(token)){
// if(token.split("\\.").length > 3){
// String loginTime = token.split("\\.")[3];
// token = token.replace("."+loginTime,"");
// }
// }
//
// // 登录信息存放Session
// webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
// platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
// tokenSessionMap.put(token,new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
// return jsonResult;
// }
//
// }else if(JT_S_03.equals(user.getJobType1())){//学生
//
// Student s = studentService.getByUserId(user.getId());
// String token = tokenService.getToken(s);
//
// if(StringUtils.isNotBlank(token)){
//
// String keyId = UUID.randomUUID().toString();
// indexTokenMap.put(keyId,token);
// jsonResult.setData(keyId);
//
// //断token的尾巴
// if(StringUtils.isNotBlank(token)){
// if(token.split("\\.").length > 3){
// String loginTime = token.split("\\.")[3];
// token = token.replace("."+loginTime,"");
// }
// }
//
// tokenSessionMap.put(token,new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
// }
//
// // 登录信息存放Session
// webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
// platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
// }
//
// return jsonResult;
// }
// }
// }else {
// return JsonResult.failMessage("登录失败，此院校不存在");
// }
//// }
//// return JsonResult.failMessage("登录失败，没有此系统权限");
// }else {
// // 记录登录信息到session
// this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
// // 登录信息存放Session。这里可能是学校管理员
// webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
// }
// return JsonResult.success();
// }
@PostMapping("/login.json")
@ResponseBody
public JsonResult login(HttpServletRequest request, HttpServletResponse response,String code, String password, Integer type, Long typeId) {
@ -700,120 +823,100 @@ public class IndexController {
}
info.setCurrentOrg(currentOrg);
if(null != user && !"JT_S_01".equals(user.getJobType1()) ){//非管理员
// if(null != type && null != typeId){
UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(user.getOrgId());
if(null != universitiesColleges && ((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())){
uSystem.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
uSystem.set("useTypes","1,2");
List<UniversitiesCollegesJurisdictionExperimentalSystem>uSystemList = universitiesCollegesJurisdictionExperimentalSystemService.getValues(uSystem);
if(null != uSystemList && uSystemList.size()>0){
uSystem = uSystemList.get(0);
}
if(null != uSystem && null != uSystem.getUniversitiesCollegesJurisdictionExperimentalSystemId()){
if(uSystem.getUseStartTime().getTime() <= System.currentTimeMillis() && uSystem.getUseEndTime().getTime() > System.currentTimeMillis()){
String msg = "";
if("JT_S_02".equals(user.getJobType1())){//如果是老师 快到期通知
if(uSystem.getUseEndTime().getTime() - System.currentTimeMillis() < 259200000L){ //少于3天做通知
msg = "请注意，系统即将过期";
}
}
JsonResult jsonResult = new JsonResult();
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setMsg(msg);
switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) {
if("JT_S_02".equals(user.getJobType1())){//老师
Teacher teacher = teacherService.getByUserId(user.getId());
String token = tokenService.getToken(teacher);
// 超管和学校管理员
case JT_S_01:
case JT_S_04: {
// 记录登录信息到session
this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
// 登录信息存放Session。这里可能是学校管理员
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
} break;
if(StringUtils.isNotBlank(token)){
// 教师
case JT_S_02: {
String keyId = UUID.randomUUID().toString();
indexTokenMap.put(keyId,token);
jsonResult.setData(keyId);
// 验证使用权，是否到期
UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(user.getOrgId());
//断token的尾巴
if(StringUtils.isNotBlank(token)){
if(token.split("\\.").length > 3){
String loginTime = token.split("\\.")[3];
token = token.replace("."+loginTime,"");
}
}
if (universitiesColleges == null) {
return JsonResult.failMessage("登录失败，此院校不存在");
}
// 登录信息存放Session
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
tokenSessionMap.put(token,new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
return jsonResult;
if(null != universitiesColleges && ((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())) {
uSystem.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
uSystem.set("useTypes", "1,2");
List<UniversitiesCollegesJurisdictionExperimentalSystem> uSystemList = universitiesCollegesJurisdictionExperimentalSystemService.getValues(uSystem);
if (null != uSystemList && uSystemList.size() > 0) {
uSystem = uSystemList.get(0);
}
if (null != uSystem && null != uSystem.getUniversitiesCollegesJurisdictionExperimentalSystemId()) {
if (uSystem.getUseStartTime().getTime() <= System.currentTimeMillis() && uSystem.getUseEndTime().getTime() > System.currentTimeMillis()) {
//如果是老师 快到期通知
if (JT_S_02.name().equals(user.getJobType1())) {
//少于3天做通知
if (uSystem.getUseEndTime().getTime() - System.currentTimeMillis() < 259200000L) {
return JsonResult.successMessage("请注意，系统即将过期");
}
}
}
}
}
}else if("JT_S_03".equals(user.getJobType1())){//学生
Teacher teacher = teacherService.getByUserId(user.getId());
String teacherToken = tokenService.getToken(teacher);
Student s = studentService.getByUserId(user.getId());
String token = tokenService.getToken(s);
if(StringUtils.isNotBlank(teacherToken)) {
if(StringUtils.isNotBlank(token)){
String keyId = UUID.randomUUID().toString();
indexTokenMap.put(keyId, teacherToken);
String keyId = UUID.randomUUID().toString();
indexTokenMap.put(keyId,token);
jsonResult.setData(keyId);
//断token的尾巴
if (StringUtils.isNotBlank(teacherToken)) {
if (teacherToken.split("\\.").length > 3) {
String loginTime = teacherToken.split("\\.")[3];
teacherToken = teacherToken.replace("." + loginTime, "");
}
}
//断token的尾巴
if(StringUtils.isNotBlank(token)){
if(token.split("\\.").length > 3){
String loginTime = token.split("\\.")[3];
token = token.replace("."+loginTime,"");
}
}
// 登录信息存放Session
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
tokenSessionMap.put(teacherToken, new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
return JsonResult.success(keyId);
}
} break;
tokenSessionMap.put(token,new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
}
// 学生
case JT_S_03: {
Student s = studentService.getByUserId(user.getId());
String studentToken = tokenService.getToken(s);
// 登录信息存放Session
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
}
if (StringUtils.isNotBlank(studentToken)) {
String keyId = UUID.randomUUID().toString();
indexTokenMap.put(keyId, studentToken);
return jsonResult;
//断token的尾巴
if (StringUtils.isNotBlank(studentToken)) {
if (studentToken.split("\\.").length > 3) {
String loginTime = studentToken.split("\\.")[3];
studentToken = studentToken.replace("." + loginTime, "");
}
}
}else {
return JsonResult.failMessage("登录失败，此院校不存在");
}
// }
// return JsonResult.failMessage("登录失败，没有此系统权限");
}else {
// 记录登录信息到session
this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
// 登录信息存放Session。这里可能是学校管理员
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
}
return JsonResult.success();
}
// @PostMapping("/login.json")
@ResponseBody
public JsonResult login2(String code, String password) {
UserLoginInfo info = null;
try {
info = userService.login(code, password);
} catch (Exception e) {
return JsonResult.failMessage(e.getMessage());
}
CoreUser user = info.getUser();
CoreOrg currentOrg = info.getOrgs().get(0);
for (CoreOrg org : info.getOrgs()) {
if (org.getId().equals(user.getOrgId())) {
currentOrg = org;
break;
}
tokenSessionMap.put(studentToken, new Object[]{user, info.getCurrentOrg(), info.getOrgs(), uSystem});
// 登录信息存放Session
webPlatformService.setUserInfoToSessionByIdentity(info.getUser());
platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), uSystem);
return JsonResult.success(keyId);
}
} break;
}
info.setCurrentOrg(currentOrg);
// 保存用户信息到Session中
this.platformService.setLoginUser(info.getUser(), info.getCurrentOrg(), info.getOrgs(), null);
return JsonResult.success();
}

Write Preview
Loading…
Cancel
Save