From 8ab4e12c610a6273eb3b3ffa0ace4fcfd48e608d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 30 Sep 2018 17:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=BF=87=E6=BB=A4=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ruoyi.pdm | 1859 ++++++++++++----- sql/ry_20180903.sql | 8 +- .../framework/aspectj/DataScopeAspect.java | 122 ++ .../{DsAspect.java => DataSourceAspect.java} | 8 +- .../aspectj/lang/annotation/DataScope.java | 21 + .../annotation/{Ds.java => DataSource.java} | 2 +- .../framework/config/ResourcesConfig.java | 2 +- .../framework/datascope/DataScopeUtils.java | 72 - .../system/dept/service/DeptServiceImpl.java | 4 +- .../system/role/service/RoleServiceImpl.java | 4 +- .../system/user/service/UserServiceImpl.java | 4 +- 11 files changed, 1480 insertions(+), 626 deletions(-) create mode 100644 src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename src/main/java/com/ruoyi/framework/aspectj/{DsAspect.java => DataSourceAspect.java} (88%) create mode 100644 src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java rename src/main/java/com/ruoyi/framework/aspectj/lang/annotation/{Ds.java => DataSource.java} (94%) delete mode 100644 src/main/java/com/ruoyi/framework/datascope/DataScopeUtils.java diff --git a/sql/ruoyi.pdm b/sql/ruoyi.pdm index 1ec5eeec..9dbddc69 100644 --- a/sql/ruoyi.pdm +++ b/sql/ruoyi.pdm @@ -1,5 +1,5 @@ - + @@ -12,8 +12,8 @@ ruoyi 1524449337 Administrator -1524449375 -Administrator +1538297587 +admin [FolderOptions] [FolderOptions\Physical Objects] @@ -47,6 +47,7 @@ RevDtbsPerm=No RevViewIndx=Yes RevJidxOpts=Yes RevStats=No +RevTspcPerm=No RevCaseSensitive=No GenTrgrStdMsg=Yes GenTrgrMsgTab= @@ -123,6 +124,7 @@ Footer=Yes Create=Yes Drop=Yes Comment=Yes +Permission=No [FolderOptions\Physical Objects\Database Generation\Tablespace\Create] Header=Yes @@ -207,7 +209,7 @@ Footer=Yes Constraint declaration=No [FolderOptions\Physical Objects\Database Generation\Table&&Column\Column] -User datatype=Yes +User datatype=No Default value=Yes Check=Yes Physical Options=Yes @@ -254,9 +256,9 @@ Constraint declaration=Yes Physical Options=Yes [FolderOptions\Physical Objects\Database Generation\Table&&Column\Index\Filter] -Primary key=Yes -Foreign key=Yes -Alternate key=Yes +Primary key=No +Foreign key=No +Alternate key=No Cluster=Yes Other=Yes @@ -309,6 +311,11 @@ For update=Yes For delete=Yes For other=Yes +[FolderOptions\Physical Objects\Database Generation\DBMSTrigger] +Create=Yes +Drop=Yes +Comment=Yes + [FolderOptions\Physical Objects\Database Generation\Synonym] Create=Yes Drop=Yes @@ -467,6 +474,8 @@ JdxDefaultOwner= DBPackDefaultOwner= SeqDefaultOwner= ProcDefaultOwner= +DBMSTrgrDefaultOwner= +Currency=USD RefrDeleteConstraint=1 RefrUpdateConstraint=1 RefrParentMandatory=No @@ -490,6 +499,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\PDMPCKG\Code] Template= @@ -502,6 +512,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\PDMDOMN] @@ -516,6 +527,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\PDMDOMN\Code] Template= @@ -528,6 +540,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\TABL] @@ -542,6 +555,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\TABL\Code] Template= @@ -554,6 +568,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\COLN] @@ -568,6 +583,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\COLN\Code] Template= @@ -580,6 +596,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\INDX] @@ -594,6 +611,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\INDX\Code] Template= @@ -606,6 +624,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\REFR] @@ -620,6 +639,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\REFR\Code] Template= @@ -632,6 +652,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VREF] @@ -646,6 +667,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VREF\Code] Template= @@ -658,6 +680,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VIEW] @@ -672,6 +695,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VIEW\Code] Template= @@ -684,6 +708,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VIEWC] @@ -698,6 +723,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\VIEWC\Code] Template= @@ -710,6 +736,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WEBSERV] @@ -724,6 +751,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WEBSERV\Code] Template= @@ -736,6 +764,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WEBOP] @@ -750,6 +779,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WEBOP\Code] Template= @@ -762,6 +792,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WPARAM] @@ -776,6 +807,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\WPARAM\Code] Template= @@ -788,6 +820,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FACT] @@ -802,6 +835,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FACT\Code] Template= @@ -814,6 +848,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DIMN] @@ -828,6 +863,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DIMN\Code] Template= @@ -840,6 +876,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\CUBE] @@ -854,6 +891,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\CUBE\Code] Template= @@ -866,6 +904,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\MEAS] @@ -880,6 +919,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\MEAS\Code] Template= @@ -892,6 +932,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DATTR] @@ -906,6 +947,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DATTR\Code] Template= @@ -918,6 +960,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FILO] @@ -932,6 +975,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FILO\Code] Template= @@ -944,6 +988,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ] @@ -958,6 +1003,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FRMEOBJ\Code] Template= @@ -970,6 +1016,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK] @@ -984,6 +1031,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\FRMELNK\Code] Template= @@ -996,6 +1044,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass] @@ -1010,6 +1059,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Physical Objects\ClssNamingOptions\DefaultClass\Code] Template= @@ -1022,6 +1072,7 @@ NoAccent=No DefaultChar= Script= ConvTable= +ConvTablePath=%_HOME%\Resource Files\Conversion Tables [ModelOptions\Connection] @@ -1051,6 +1102,11 @@ SaveLinks=Yes ORMapping=No NameToCode=No +[ModelOptions\Generate\Ldm] +CheckModel=Yes +SaveLinks=Yes +NameToCode=No + [ModelOptions\Default Opts] [ModelOptions\Default Opts\TABL] @@ -1106,8 +1162,8 @@ PhysOpts= PhysicalDiagram_1 1524449325 Administrator -1524449375 -Administrator +1538297386 +admin [DisplayPreferences] [DisplayPreferences\PDM] @@ -1115,6 +1171,7 @@ PhysOpts= [DisplayPreferences\General] Adjust to text=Yes Snap Grid=No +Constrain Labels=Yes Display Grid=No Show Page Delimiter=Yes Grid size=0 @@ -1130,6 +1187,7 @@ Gradient end color=255, 255, 255 Show Swimlane=No SwimlaneVert=Yes TreeVert=No +CompDark=0 [DisplayPreferences\Object] Mode=0 @@ -1147,21 +1205,76 @@ Shortcut ExtLastPackage=Yes Shortcut ExtIncludeModl=Yes EObjShowStrn=Yes ExtendedObject.Comment=No +ExtendedObject.IconPicture=No +ExtendedObject_SymbolLayout=<Form>[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Object Name" Attribute="DisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF] <Separator Name="Separator" />[CRLF] <StandardAttribute Name="Comment" Attribute="Comment" Prefix="" Suffix="" Alignment="LEFT" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Icon" Attribute="IconPicture" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF]</Form> ELnkShowStrn=Yes ELnkShowName=Yes -File Location=No -PckgStrn=Yes +ExtendedLink_SymbolLayout=<Form>[CRLF] <Form Name="Center" >[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </Form>[CRLF] <Form Name="Source" >[CRLF] </Form>[CRLF] <Form Name="Destination" >[CRLF] </Form>[CRLF]</Form> +FileObject.Stereotype=No +FileObject.DisplayName=Yes +FileObject.LocationOrName=No +FileObject.IconPicture=No +FileObject.IconMode=Yes +FileObject_SymbolLayout=<Form>[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="Yes" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Location" Attribute="LocationOrName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] <StandardAttribute Name="Icon" Attribute="IconPicture" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF]</Form> +PckgShowStrn=Yes Package.Comment=No +Package.IconPicture=No +Package_SymbolLayout= Display Model Version=Yes -TablColn=Yes +Table.Stereotype=Yes +Table.DisplayName=Yes +Table.OwnerDisplayName=No +Table.Columns=Yes +Table.Columns._Filter=""PDMCOLNALL +Table.Columns._Columns=Stereotype DataType KeyIndicator +Table.Columns._Limit=-5 +Table.Keys=No +Table.Keys._Columns=Stereotype Indicator +Table.Indexes=No +Table.Indexes._Columns=Stereotype +Table.Triggers=No +Table.Triggers._Columns=Stereotype +Table.Comment=No +Table.IconPicture=No +Table_SymbolLayout=<Form>[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="Yes" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Owner and Name" Attribute="OwnerDisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] <Separator Name="Separator" />[CRLF] <StandardCollection Name="Columns" Collection="Columns" Columns="Stereotype No\r\nDisplayName Yes\r\nDataType No\r\nSymbolDataType No &quot;Domain or Data type&quot;\r\nDomain No\r\nKeyIndicator No\r\nIndexIndicator No\r\nNullStatus No" Filters="&quot;All Columns&quot; PDMCOLNALL &quot;&quot;\r\n&quot;PK Columns&quot; PDMCOLNPK &quot;PRIM \&quot;TRUE\&quot; TRUE&quot;\r\n&quot;Key Columns&quot; PDMCOLNKEY &quot;KEYS \&quot;TRUE\&quot; TRUE&quot;" HasLimit="Yes" Caption="" Mandatory="No" />[CRLF] <StandardCollection Name="Keys" Collection="Keys" Columns="Stereotype No\r\nDisplayName Yes\r\nIndicator No" HasLimit="No" Caption="" Mandatory="No" />[CRLF] <StandardCollection Name="Indexes" Collection="Indexes" Columns="Stereotype No\r\nDisplayName Yes\r\nIndicator No" HasLimit="No" Caption="" Mandatory="No" />[CRLF] <StandardCollection Name="Triggers" Collection="Triggers" Columns="Stereotype No\r\nDisplayName Yes" HasLimit="No" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Comment" Attribute="Comment" Prefix="" Suffix="" Alignment="LEFT" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Icon" Attribute="IconPicture" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF]</Form> +View.Stereotype=Yes +View.DisplayName=Yes +View.OwnerDisplayName=No +View.Columns=Yes +View.Columns._Columns=DisplayName +View.Columns._Limit=-5 +View.TemporaryVTables=Yes +View.Indexes=No +View.Comment=No +View.IconPicture=No +View_SymbolLayout=<Form>[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="Yes" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Owner and Name" Attribute="OwnerDisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] <Separator Name="Separator" />[CRLF] <StandardCollection Name="Columns" Collection="Columns" Columns="DisplayName No\r\nExpression No\r\nDataType No\r\nSymbolDataType No &quot;Domain or Data type&quot;\r\nIndexIndicator No" HasLimit="Yes" Caption="" Mandatory="No" />[CRLF] <StandardCollection Name="Tables" Collection="TemporaryVTables" Columns="Name Yes" HasLimit="No" Caption="" Mandatory="No" />[CRLF] <StandardCollection Name="Indexes" Collection="Indexes" Columns="DisplayName Yes" HasLimit="No" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Comment" Attribute="Comment" Prefix="" Suffix="" Alignment="LEFT" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Icon" Attribute="IconPicture" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF]</Form> +Procedure.Stereotype=No +Procedure.DisplayName=Yes +Procedure.OwnerDisplayName=No +Procedure.Comment=No +Procedure.IconPicture=No +Procedure_SymbolLayout=<Form>[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="Yes" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Owner and Name" Attribute="OwnerDisplayName" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] <Separator Name="Separator" />[CRLF] <StandardAttribute Name="Comment" Attribute="Comment" Prefix="" Suffix="" Alignment="LEFT" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Icon" Attribute="IconPicture" Prefix="" Suffix="" Alignment="CNTR" Caption="" Mandatory="Yes" />[CRLF]</Form> +Reference.Cardinality=No +Reference.ImplementationType=No +Reference.ChildRole=Yes +Reference.Stereotype=Yes +Reference.DisplayName=No +Reference.ForeignKeyConstraintName=Yes +Reference.JoinExpression=No +Reference.Integrity=No +Reference.ParentRole=Yes +Reference_SymbolLayout=<Form>[CRLF] <Form Name="Source" >[CRLF] <StandardAttribute Name="Cardinality" Attribute="Cardinality" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Implementation" Attribute="ImplementationType" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Child Role" Attribute="ChildRole" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </Form>[CRLF] <Form Name="Center" >[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="No" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Cons&amp;traint Name" Attribute="ForeignKeyConstraintName" Prefix="" Suffix="" Caption="Cons&amp;traint Name" Mandatory="No" />[CRLF] <StandardAttribute Name="Join" Attribute="JoinExpression" Prefix="" Suffix="" Caption="Join" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] <StandardAttribute Name="Referential integrity" Attribute="Integrity" Prefix="" Suffix="" Caption="Referential integrity" Mandatory="No" />[CRLF] </Form>[CRLF] <Form Name="Destination" >[CRLF] <StandardAttribute Name="Parent Role" Attribute="ParentRole" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </Form>[CRLF]</Form> +ViewReference.ChildRole=Yes +ViewReference.Stereotype=Yes +ViewReference.DisplayName=No +ViewReference.JoinExpression=No +ViewReference.ParentRole=Yes +ViewReference_SymbolLayout=<Form>[CRLF] <Form Name="Source" >[CRLF] <StandardAttribute Name="Child Role" Attribute="ChildRole" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </Form>[CRLF] <Form Name="Center" >[CRLF] <StandardAttribute Name="Stereotype" Attribute="Stereotype" Prefix="&lt;&lt;" Suffix="&gt;&gt;" Caption="" Mandatory="No" />[CRLF] <ExclusiveChoice Name="Exclusive Choice" Mandatory="No" Display="HorizontalRadios" >[CRLF] <StandardAttribute Name="Name" Attribute="DisplayName" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] <StandardAttribute Name="Join Expression" Attribute="JoinExpression" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </ExclusiveChoice>[CRLF] </Form>[CRLF] <Form Name="Destination" >[CRLF] <StandardAttribute Name="Parent Role" Attribute="ParentRole" Prefix="" Suffix="" Caption="" Mandatory="No" />[CRLF] </Form>[CRLF]</Form> +File Location=No +PckgStrn=Yes ColnMode=0 ColnMax=5 -TablIndx=No -TablKey=No -TablTrgr=No TablOwnr=No -TablStrn=Yes -TablCmmt=No ColnDttp=Yes ColnDomn=No ColnShowDomn=No @@ -1169,36 +1282,16 @@ ColnKey=Yes ColnIndx=No ColnMand=No ColnStrn=Yes -ViewTabl=Yes -ViewIndx=No -ViewColn=Yes -ViewOwnr=No -ViewStrn=Yes -ViewCmmt=No VColName=Yes VColExpr=No VColDttp=No VColIndx=No VColCMod=0 VColCMax=5 -RefrName=No -RefrJoin=No -RefrCnam=Yes -RefrIntg=No -RefrImpl=No -RefrCard=No -RefrStrn=Yes -RefrRole=Yes -VRefName=No -VRefJoin=No -VRefStrn=Yes -VRefRole=Yes ProcOwnr=No KeyStrn=Yes IndxStrn=Yes TrgrStrn=Yes -ProcStrn=No -Procedure.Comment=No [DisplayPreferences\Symbol] @@ -1229,16 +1322,55 @@ Shadow color=192 192 192 Shadow=0 [DisplayPreferences\Symbol\FRMELNK] -DISPNAMEFont=新宋体,8,N -DISPNAMEFont color=0, 0, 0 +CENTERFont=新宋体,8,N +CENTERFont color=0, 0, 0 Line style=0 +AutoAdjustToText=Yes +Keep aspect=No +Keep center=No +Keep size=No +Brush color=255 255 255 +Fill Color=Yes +Brush style=1 +Brush bitmap mode=12 +Brush gradient mode=0 +Brush gradient color=118 118 118 +Brush background image= +Custom shape= +Custom text mode=0 Pen=1 0 128 128 255 Shadow color=192 192 192 Shadow=0 +[DisplayPreferences\Symbol\FILO] +OBJSTRNFont=新宋体,8,N +OBJSTRNFont color=0, 0, 0 +DISPNAMEFont=新宋体,8,N +DISPNAMEFont color=0, 0, 0 +LCNMFont=新宋体,8,N +LCNMFont color=0, 0, 0 +AutoAdjustToText=Yes +Keep aspect=Yes +Keep center=Yes +Keep size=No +Width=2400 +Height=2400 +Brush color=255 255 255 +Fill Color=No +Brush style=1 +Brush bitmap mode=12 +Brush gradient mode=0 +Brush gradient color=118 118 118 +Brush background image= +Custom shape= +Custom text mode=0 +Pen=1 0 0 0 255 +Shadow color=192 192 192 +Shadow=0 + [DisplayPreferences\Symbol\PDMPCKG] -PckgStrnFont=新宋体,8,N -PckgStrnFont color=0, 0, 0 +STRNFont=新宋体,8,N +STRNFont color=0, 0, 0 DISPNAMEFont=新宋体,8,N DISPNAMEFont color=0, 0, 0 LABLFont=新宋体,8,N @@ -1263,24 +1395,26 @@ Shadow color=192 192 192 Shadow=0 [DisplayPreferences\Symbol\TABL] -TablStrnFont=新宋体,8,N -TablStrnFont color=0, 0, 0 +STRNFont=新宋体,8,N +STRNFont color=0, 0, 0 DISPNAMEFont=新宋体,8,N DISPNAMEFont color=0, 0, 0 -TableColumnsFont=新宋体,8,N -TableColumnsFont color=0, 0, 0 +OWNRDISPNAMEFont=新宋体,8,N +OWNRDISPNAMEFont color=0, 0, 0 +ColumnsFont=新宋体,8,N +ColumnsFont color=0, 0, 0 TablePkColumnsFont=新宋体,8,U TablePkColumnsFont color=0, 0, 0 TableFkColumnsFont=新宋体,8,N TableFkColumnsFont color=0, 0, 0 -TableKeysFont=新宋体,8,N -TableKeysFont color=0, 0, 0 -TableIndexsFont=新宋体,8,N -TableIndexsFont color=0, 0, 0 -TableTriggersFont=新宋体,8,N -TableTriggersFont color=0, 0, 0 -TableCommentFont=新宋体,8,N -TableCommentFont color=0, 0, 0 +KeysFont=新宋体,8,N +KeysFont color=0, 0, 0 +IndexesFont=新宋体,8,N +IndexesFont color=0, 0, 0 +TriggersFont=新宋体,8,N +TriggersFont color=0, 0, 0 +LABLFont=新宋体,8,N +LABLFont color=0, 0, 0 AutoAdjustToText=Yes Keep aspect=No Keep center=No @@ -1300,63 +1434,25 @@ Pen=1 0 0 128 192 Shadow color=192 192 192 Shadow=0 -[DisplayPreferences\Symbol\REFR] -DISPNAMEFont=新宋体,8,N -DISPNAMEFont color=0, 0, 0 -CARDFont=新宋体,8,N -CARDFont color=0, 0, 0 -Line style=0 -AutoAdjustToText=Yes -Keep aspect=No -Keep center=No -Keep size=No -Brush color=255 255 255 -Fill Color=Yes -Brush style=1 -Brush bitmap mode=12 -Brush gradient mode=0 -Brush gradient color=118 118 118 -Brush background image= -Custom shape= -Custom text mode=0 -Pen=1 0 0 128 192 -Shadow color=192 192 192 -Shadow=0 - -[DisplayPreferences\Symbol\VREF] -DISPNAMEFont=新宋体,8,N -DISPNAMEFont color=0, 0, 0 -Line style=0 -AutoAdjustToText=Yes -Keep aspect=No -Keep center=No -Keep size=No -Brush color=255 255 255 -Fill Color=Yes -Brush style=1 -Brush bitmap mode=12 -Brush gradient mode=0 -Brush gradient color=118 118 118 -Brush background image= -Custom shape= -Custom text mode=0 -Pen=1 0 128 128 192 -Shadow color=192 192 192 -Shadow=0 - [DisplayPreferences\Symbol\VIEW] -ViewStrnFont=新宋体,8,N -ViewStrnFont color=0, 0, 0 +STRNFont=新宋体,8,N +STRNFont color=0, 0, 0 DISPNAMEFont=新宋体,8,N DISPNAMEFont color=0, 0, 0 -ViewColumnnFont=新宋体,8,N -ViewColumnnFont color=0, 0, 0 -ViewIndexesFont=新宋体,8,N -ViewIndexesFont color=0, 0, 0 -ViewTablesFont=新宋体,8,N -ViewTablesFont color=0, 0, 0 -ViewCommentFont=新宋体,8,N -ViewCommentFont color=0, 0, 0 +OWNRDISPNAMEFont=新宋体,8,N +OWNRDISPNAMEFont color=0, 0, 0 +ColumnsFont=新宋体,8,N +ColumnsFont color=0, 0, 0 +TablePkColumnsFont=新宋体,8,U +TablePkColumnsFont color=0, 0, 0 +TableFkColumnsFont=新宋体,8,N +TableFkColumnsFont color=0, 0, 0 +TemporaryVTablesFont=新宋体,8,N +TemporaryVTablesFont color=0, 0, 0 +IndexesFont=新宋体,8,N +IndexesFont color=0, 0, 0 +LABLFont=新宋体,8,N +LABLFont color=0, 0, 0 AutoAdjustToText=Yes Keep aspect=No Keep center=No @@ -1377,10 +1473,12 @@ Shadow color=192 192 192 Shadow=0 [DisplayPreferences\Symbol\PROC] -ProcStrnFont=新宋体,8,N -ProcStrnFont color=0, 0, 0 +STRNFont=新宋体,8,N +STRNFont color=0, 0, 0 DISPNAMEFont=新宋体,8,N DISPNAMEFont color=0, 0, 0 +OWNRDISPNAMEFont=新宋体,8,N +OWNRDISPNAMEFont color=0, 0, 0 LABLFont=新宋体,8,N LABLFont color=0, 0, 0 AutoAdjustToText=Yes @@ -1402,17 +1500,20 @@ Pen=1 0 128 108 0 Shadow color=192 192 192 Shadow=0 -[DisplayPreferences\Symbol\FILO] -NAMEFont=新宋体,8,N -NAMEFont color=0, 0, 0 +[DisplayPreferences\Symbol\REFR] +SOURCEFont=新宋体,8,N +SOURCEFont color=0, 0, 0 +CENTERFont=新宋体,8,N +CENTERFont color=0, 0, 0 +DESTINATIONFont=新宋体,8,N +DESTINATIONFont color=0, 0, 0 +Line style=0 AutoAdjustToText=Yes -Keep aspect=Yes -Keep center=Yes +Keep aspect=No +Keep center=No Keep size=No -Width=2400 -Height=2400 Brush color=255 255 255 -Fill Color=No +Fill Color=Yes Brush style=1 Brush bitmap mode=12 Brush gradient mode=0 @@ -1420,7 +1521,32 @@ Brush gradient color=118 118 118 Brush background image= Custom shape= Custom text mode=0 -Pen=1 0 0 0 255 +Pen=1 0 0 128 192 +Shadow color=192 192 192 +Shadow=0 + +[DisplayPreferences\Symbol\VREF] +SOURCEFont=新宋体,8,N +SOURCEFont color=0, 0, 0 +CENTERFont=新宋体,8,N +CENTERFont color=0, 0, 0 +DESTINATIONFont=新宋体,8,N +DESTINATIONFont color=0, 0, 0 +Line style=0 +AutoAdjustToText=Yes +Keep aspect=No +Keep center=No +Keep size=No +Brush color=255 255 255 +Fill Color=Yes +Brush style=1 +Brush bitmap mode=12 +Brush gradient mode=0 +Brush gradient color=118 118 118 +Brush background image= +Custom shape= +Custom text mode=0 +Pen=1 0 128 128 192 Shadow color=192 192 192 Shadow=0 @@ -1472,20 +1598,22 @@ Shadow=0 1524449375 -1524449886 -((-38123,15548), (-26435,27219)) +1538296407 +-1 +((-38123,15297), (-26435,28269)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1496,19 +1624,21 @@ TableComment 0 新宋体,8,N 1524449375 1524449886 -((-23934,13073), (-11861,27219)) +-1 +((-23935,12010), (-11861,28282)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1518,20 +1648,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-9360,17198), (2713,27219)) +1538296409 +-1 +((-9361,18172), (2713,27845)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1542,19 +1674,21 @@ TableComment 0 新宋体,8,N 1524449375 1524449886 -((5214,17198), (17287,27219)) +-1 +((5214,16547), (17288,27869)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1564,20 +1698,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((19788,13898), (31861,27219)) +1538296412 +-1 +((19788,14872), (31862,27845)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1587,20 +1723,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-38123,4073), (-29525,8072)) +1538296204 +-1 +((-37598,8498), (-29000,12497)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1610,20 +1748,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-27024,4073), (-18426,8072)) +1538296205 +-1 +((-37674,3548), (-29076,7547)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1633,20 +1773,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-15925,4073), (-5782,8072)) +1538296308 +-1 +((-37528,-6452), (-28929,-2453)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1656,20 +1798,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-3551,1426), (8522,13922)) +1538296401 +-1 +((-24280,-1775), (-11048,10373)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1679,20 +1823,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((11293,-1949), (23366,8072)) +1538296599 +-1 +((-9182,625), (2892,10298)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1702,20 +1848,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((25867,-2775), (37940,8072)) +1538296612 +-1 +((5017,-2538), (17091,10434)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1725,20 +1873,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-39023,-11227), (-27335,-2855)) +1538297772 +-1 +((-39520,-17440), (-26288,-8592)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1748,20 +1898,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-24024,-12066), (-10405,-2045)) +1538297770 +-1 +((-24744,-19106), (-10738,-8608)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1771,20 +1923,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((-7724,-17856), (5895,-6185)) +1538297380 +-1 +((-9749,-20696), (3870,-8548)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1794,20 +1948,22 @@ TableComment 0 新宋体,8,N 1524449375 -1524449886 -((9386,-15472), (22619,-6275)) +1538297383 +-1 +((5261,-17623), (18494,-8774)) 12615680 16570034 12632256 -TablStrn 0 新宋体,8,N +STRN 0 新宋体,8,N DISPNAME 0 新宋体,8,N -TableColumns 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N TablePkColumns 0 新宋体,8,U TableFkColumns 0 新宋体,8,N -TableKeys 0 新宋体,8,N -TableIndexs 0 新宋体,8,N -TableTriggers 0 新宋体,8,N -TableComment 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N 6 65 16777215 @@ -1815,6 +1971,94 @@ TableComment 0 新宋体,8,N + +1538296083 +1538296211 +-1 +((-37675,-1349), (-29076,2650)) +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 + + + + + +1538296587 +1538296608 +-1 +((19570,-987), (32030,8687)) +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 + + + + + +config_id +1538296632 +1538297253 +((-13950,-17175), (73200,19575)) +4130 +1 +0 +7 +16777215 +16777215 +新宋体,8,N + + +1538297386 +1538297498 +-1 +((19859,-18262), (33092,-8589)) +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 + + + + @@ -1828,10 +2072,12 @@ TableComment 0 新宋体,8,N sys_dept 1524449375 Administrator -1524449375 -Administrator +1538297518 +admin +部门表 + - + 00C66282-419A-4915-8509-DFFFE6352DE8 dept_id dept_id @@ -1845,7 +2091,7 @@ TableComment 0 新宋体,8,N 1 1 - + 5B6FB0B1-5B1E-4E86-AF2A-72C49EBB315E parent_id parent_id @@ -1858,7 +2104,18 @@ TableComment 0 新宋体,8,N int(11) 11 - + +065E33A5-6AB5-44F1-8FEC-A72311EECD66 +ancestors +ancestors +1538295690 +admin +1538295792 +admin +varchar(50) +50 + + EBB59EC8-AFD4-40E3-B811-DD5040728D91 dept_name dept_name @@ -1871,7 +2128,7 @@ TableComment 0 新宋体,8,N varchar(30) 30 - + 2F26C025-82B0-4AC5-AEE0-32BA07B7B529 order_num order_num @@ -1884,7 +2141,7 @@ TableComment 0 新宋体,8,N int(4) 4 - + CA504E09-528C-482E-A0C7-F86C559AA3A6 leader leader @@ -1897,7 +2154,7 @@ TableComment 0 新宋体,8,N varchar(20) 20 - + 9CFC55C4-DF2B-4A90-A789-C3839FAA43A8 phone phone @@ -1910,7 +2167,7 @@ TableComment 0 新宋体,8,N varchar(20) 20 - + 1A9407E5-D74E-4CE9-9078-C4EC25393F7B email email @@ -1923,20 +2180,31 @@ TableComment 0 新宋体,8,N varchar(20) 20 - + B6772812-4B69-4248-871D-FA1B4BA0E5F7 status status 1524449375 Administrator -1524449375 -Administrator +1538295792 +admin 部门状态:0正常,1停用 0 -int(1) +char(1) 1 - + +6EBD2BFF-861E-4247-BAAB-B37CCBAF6F8D +del_flag +del_flag +1538295690 +admin +1538295792 +admin +char(1) +1 + + 2504A090-F6D6-493F-855E-5154E01AF0CA create_by create_by @@ -1949,7 +2217,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + D866AE9E-E7FF-47B2-BF3D-9BC1605A2F39 create_time create_time @@ -1960,7 +2228,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 7C6C9836-FC23-4492-8CF1-A4439E01B57C update_by update_by @@ -1973,7 +2241,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + FCED770D-005C-4531-A9D7-D1FD0A054719 update_time update_time @@ -1986,7 +2254,7 @@ TableComment 0 新宋体,8,N - + 15C1774B-9F17-48B6-A61F-728A25220B30 Key_1 Key_1 @@ -1995,12 +2263,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -2009,10 +2277,12 @@ TableComment 0 新宋体,8,N sys_user 1524449375 Administrator -1524449375 -Administrator +1538297540 +admin +用户信息表 + - + 4A920BCE-4040-4F12-89D2-7DF345B90321 user_id user_id @@ -2026,20 +2296,20 @@ TableComment 0 新宋体,8,N 1 1 - + 174E10B2-4A4D-40FF-80B8-B4D285561E42 dept_id dept_id 1524449375 Administrator -1524449375 -Administrator +1538297552 +admin 部门ID NULL -int(20) -20 +int(11) +11 - + 1D4908A9-5416-4252-BA09-FA122D0194C3 login_name login_name @@ -2052,7 +2322,7 @@ TableComment 0 新宋体,8,N varchar(30) 30 - + 2EF63346-9E82-4746-81B7-AB67D727446D user_name user_name @@ -2065,7 +2335,20 @@ TableComment 0 新宋体,8,N varchar(30) 30 - + +477EA57C-0E0B-4596-9A85-EC91E72F5160 +user_type +user_type +1524449375 +Administrator +1524449375 +Administrator +类型:Y默认用户,N非默认用户 +N +char(1) +1 + + CD16FFF4-F214-473B-A9A8-FA30A3E357D1 email email @@ -2078,7 +2361,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 61603FA5-3EBC-4389-AED7-1B54D238A563 phonenumber phonenumber @@ -2091,7 +2374,29 @@ TableComment 0 新宋体,8,N varchar(20) 20 - + +65E9DE55-ED58-4BD9-B96C-7C081D1119B2 +sex +sex +1538295815 +admin +1538295948 +admin +char(1) +1 + + +E5E35061-221A-4BB9-AA22-3CF20F1FCCF6 +avatar +avatar +1538295815 +admin +1538295948 +admin +varchar(100) +100 + + 4ED1C2BF-B826-4A82-9464-EEBF271F4054 password password @@ -2104,7 +2409,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 53E6BB49-3435-46E0-832F-BCAFE1A021CB salt salt @@ -2117,46 +2422,33 @@ TableComment 0 新宋体,8,N varchar(100) 100 - -477EA57C-0E0B-4596-9A85-EC91E72F5160 -user_type -user_type -1524449375 -Administrator -1524449375 -Administrator -类型:Y默认用户,N非默认用户 -N -char(1) -1 - - + 245CAD53-B33B-4EED-8CFA-7AA10ED943B8 status status 1524449375 Administrator -1524449375 -Administrator +1538297540 +admin 帐号状态:0正常,1禁用 0 -int(1) +char(1) 1 - + 7F851464-6CC5-445B-9413-2A89B9CE90CB -refuse_des -refuse_des +del_flag +del_flag 1524449375 Administrator -1524449375 -Administrator +1538295948 +admin 拒绝登录描述 '' -varchar(500) -500 +char(1) +1 - + 3DC8EC79-D75A-4BF8-8FBC-152E938AC14F create_by create_by @@ -2169,7 +2461,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 48C8C936-7A34-4A97-AACA-A6F07751FFAD create_time create_time @@ -2180,7 +2472,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 6050B4F3-9B26-4B40-AB4C-BA483F179958 update_by update_by @@ -2193,7 +2485,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + CD1E7E11-8EB6-4C9C-A69C-39CBCF10573E update_time update_time @@ -2204,9 +2496,20 @@ TableComment 0 新宋体,8,N 更新时间 timestamp + +F9F55D4C-13E6-49A0-BFDB-E0AFE0FA5501 +remark +remark +1538295815 +admin +1538295948 +admin +varchar(500) +500 + - + 2E35FD67-A7A7-4B10-85E4-85115AD0E143 Key_1 Key_1 @@ -2215,12 +2518,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -2229,10 +2532,12 @@ TableComment 0 新宋体,8,N sys_post 1524449375 Administrator -1524449375 -Administrator +1538297571 +admin +岗位信息表 + - + FB04D29E-41F0-49A3-BFDB-58E222843F21 post_id post_id @@ -2246,7 +2551,7 @@ TableComment 0 新宋体,8,N 1 1 - + 50010C4E-4F59-47B9-8F08-05E8E071E8B1 post_code post_code @@ -2259,7 +2564,7 @@ TableComment 0 新宋体,8,N 64 1 - + 0F929250-051E-4344-B22A-C30E071A543B post_name post_name @@ -2272,7 +2577,7 @@ TableComment 0 新宋体,8,N 100 1 - + 2BC9005E-350F-46BE-98D6-9B13060F1B20 post_sort post_sort @@ -2285,20 +2590,20 @@ TableComment 0 新宋体,8,N 4 1 - + F6D7AD3E-5EA0-4759-B6BF-6334B7105B78 status status 1524449375 Administrator -1524449375 -Administrator +1538297565 +admin 状态（0正常 1停用） -int(1) +char(1) 1 1 - + CED01369-5063-479D-A444-32936369A486 create_by create_by @@ -2311,7 +2616,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + A29528FF-A2B9-4149-B997-1B0204D42E40 create_time create_time @@ -2322,7 +2627,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 6026A05D-0C1E-497E-8EAF-FDB704BE6A52 update_by update_by @@ -2335,7 +2640,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + DF516F5F-CD82-4347-AC57-BDCB4E5DD75E update_time update_time @@ -2346,7 +2651,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + 539CEC34-49F0-49A0-9B7C-B84655FD2233 remark remark @@ -2361,7 +2666,7 @@ TableComment 0 新宋体,8,N - + 14E893B1-D0BA-46A7-A905-F0FFA089B65A Key_1 Key_1 @@ -2370,12 +2675,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -2384,10 +2689,12 @@ TableComment 0 新宋体,8,N sys_role 1524449375 Administrator -1524449375 -Administrator +1538297608 +admin +角色信息表 + - + A420E2C9-8FE3-452A-9047-C7BEACE8490C role_id role_id @@ -2401,7 +2708,7 @@ TableComment 0 新宋体,8,N 1 1 - + 9342763D-5B89-4440-965B-2B55DB4ACD86 role_name role_name @@ -2414,7 +2721,7 @@ TableComment 0 新宋体,8,N 30 1 - + 54480009-0C7E-40F2-AA76-CD914A6D66C5 role_key role_key @@ -2427,33 +2734,54 @@ TableComment 0 新宋体,8,N 100 1 - + E73F4D0E-12A0-42B5-B3CE-B573D499DD6C role_sort role_sort 1524449375 Administrator -1524449375 -Administrator +1538296031 +admin 显示顺序 int(10) 10 -1 - + +5F836F54-9EBD-4768-AA3C-F268F5FAFE8D +data_scope +data_scope +1538295973 +admin +1538296031 +admin +char(1) +1 + + 424ED799-E4C1-44AD-A172-C2B3C405E9C5 status status 1524449375 Administrator -1524449375 -Administrator +1538297608 +admin 角色状态:0正常,1禁用 0 -int(1) +char(1) 1 - + +8E034C76-5966-4246-B81B-7B12F37D96A7 +del_flag +del_flag +1538295973 +admin +1538296031 +admin +char(1) +1 + + 214F6E1F-28B1-454B-ABF0-D1C43220129D create_by create_by @@ -2466,7 +2794,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 1A6D5791-0353-4ABC-8BC2-921BB87A2E5A create_time create_time @@ -2477,7 +2805,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + D6394880-A49C-4B83-B43A-5FDBAA918AA3 update_by update_by @@ -2490,7 +2818,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 34285DF5-8E36-452B-A3AA-9F4290C20F7E update_time update_time @@ -2501,7 +2829,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + 2FAB98F7-68A2-460B-8A20-5D5DA73F5103 remark remark @@ -2516,7 +2844,7 @@ TableComment 0 新宋体,8,N - + 4342E67F-D33C-435F-9865-973E053B6075 Key_1 Key_1 @@ -2525,12 +2853,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -2539,10 +2867,12 @@ TableComment 0 新宋体,8,N sys_menu 1524449375 Administrator -1524449375 -Administrator +1538297627 +admin +菜单权限表 + - + BB061292-3B99-432E-9B96-5362AAD918B9 menu_id menu_id @@ -2556,7 +2886,7 @@ TableComment 0 新宋体,8,N 1 1 - + EA8422AB-37B1-4D60-A3C9-A4BF9039A9D4 menu_name menu_name @@ -2569,7 +2899,7 @@ TableComment 0 新宋体,8,N 50 1 - + E56E04A8-63F6-4271-92E3-974DC84DD536 parent_id parent_id @@ -2582,7 +2912,7 @@ TableComment 0 新宋体,8,N int(11) 11 - + 1809914E-6B09-4CD2-8916-E603D6717557 order_num order_num @@ -2595,7 +2925,7 @@ TableComment 0 新宋体,8,N int(4) 4 - + FCB44D46-3C21-40CB-B942-57823E52E5B1 url url @@ -2608,7 +2938,7 @@ TableComment 0 新宋体,8,N varchar(200) 200 - + 667EE044-6805-4668-BAF4-E78B3052051F menu_type menu_type @@ -2621,20 +2951,20 @@ TableComment 0 新宋体,8,N char(1) 1 - + F7658083-BCAB-46F7-AF31-8A4B1D8749EF visible visible 1524449375 Administrator -1524449375 -Administrator +1538297627 +admin 菜单状态:0显示,1隐藏 0 -int(1) +char(1) 1 - + 528611C8-C319-430F-8F00-68FBA60F310B perms perms @@ -2647,7 +2977,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 38004CD7-8DD0-43F1-9E59-B50132CB6F1A icon icon @@ -2660,7 +2990,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 6927665F-EC42-4E1F-A275-4B27F442B6B8 create_by create_by @@ -2673,7 +3003,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 1A6A4D0F-0B0B-4522-B4DA-3F1D592CB889 create_time create_time @@ -2684,7 +3014,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 605D7776-4820-4BA9-91E8-AD837B73AEFB update_by update_by @@ -2697,7 +3027,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 4CFF26BB-8736-4864-855E-C7C1B133370B update_time update_time @@ -2708,7 +3038,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + 67C6E46C-DF06-480A-BC74-E927406E5D26 remark remark @@ -2723,7 +3053,7 @@ TableComment 0 新宋体,8,N - + 08EBE713-9E4D-4312-AA7D-2E4E439734E5 Key_1 Key_1 @@ -2732,12 +3062,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -2746,10 +3076,12 @@ TableComment 0 新宋体,8,N sys_user_role 1524449375 Administrator -1524449375 -Administrator +1538297676 +admin +用户和角色关联表 + - + 73701F72-C45B-4CA0-8A62-632890E3DEF0 user_id user_id @@ -2762,7 +3094,7 @@ TableComment 0 新宋体,8,N 11 1 - + CABD458B-DA59-46A8-99C3-088AD8D34097 role_id role_id @@ -2777,7 +3109,7 @@ TableComment 0 新宋体,8,N - + 37C3213B-EF22-4CD4-A91F-9A9A2503FB2A Key_1 Key_1 @@ -2786,13 +3118,13 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - - + + - + @@ -2801,10 +3133,12 @@ TableComment 0 新宋体,8,N sys_role_menu 1524449375 Administrator -1524449375 -Administrator +1538297683 +admin +角色和菜单关联表 + - + D2E151A5-6156-46EF-844E-0ADC3070293B role_id role_id @@ -2817,7 +3151,7 @@ TableComment 0 新宋体,8,N 11 1 - + 6B8C1E62-FD8B-4504-8FA0-F69917722FBD menu_id menu_id @@ -2832,7 +3166,7 @@ TableComment 0 新宋体,8,N - + 2E72304F-91F0-4392-BAE8-BBF7A4346B7D Key_1 Key_1 @@ -2841,13 +3175,13 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - - + + - + @@ -2856,38 +3190,40 @@ TableComment 0 新宋体,8,N sys_user_post 1524449375 Administrator -1524449375 -Administrator +1538297694 +admin +用户与岗位关联表 + - + E4A1CAB6-0F63-4917-ACEF-418DE7F894BA user_id user_id 1524449375 Administrator -1524449375 -Administrator +1538296306 +admin 用户ID -varchar(64) -64 +int(11) +11 1 - + 8E7188D5-B3A5-4F1D-B6CB-D77D652414DE post_id post_id 1524449375 Administrator -1524449375 -Administrator +1538296306 +admin 岗位ID -varchar(64) -64 +int(11) +11 1 - + 4091B7D3-2404-4C20-BBCD-B63E22A5E960 Key_1 Key_1 @@ -2896,13 +3232,13 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - - + + - + @@ -2911,10 +3247,12 @@ TableComment 0 新宋体,8,N sys_oper_log 1524449375 Administrator -1524449375 -Administrator +1538297699 +admin +操作日志记录 + - + F5FC8AC1-7415-4A57-BA2C-EE2E7B9E1EFC oper_id oper_id @@ -2928,7 +3266,7 @@ TableComment 0 新宋体,8,N 1 1 - + 2103BC5C-E28D-4369-8369-E898B218587A title title @@ -2941,20 +3279,20 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + 6816377B-3DB6-424A-99ED-1D20FEB30ED4 -action -action +business_type +business_type 1524449375 Administrator -1524449375 -Administrator +1538296397 +admin 功能请求 '' -varchar(100) -100 +int(2) +2 - + 9CA3B7C3-F52C-4E2E-893F-8E6EBA7B2667 method method @@ -2967,33 +3305,33 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + A5744803-C050-4108-9D15-7A0B95F03642 -channel -channel +operator_type +operator_type 1524449375 Administrator -1524449375 -Administrator +1538296397 +admin 来源渠道 '' -varchar(20) -20 +int(1) +1 - + B0DF8235-6BC1-452C-8B30-A56F0430E4F5 -login_name -login_name +oper_name +oper_name 1524449375 Administrator -1524449375 -Administrator +1538296397 +admin 登录账号 '' varchar(50) 50 - + 25315A12-4EB9-4B67-9E2C-9F40F8EF7FAB dept_name dept_name @@ -3006,7 +3344,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + 7AF8602B-A1DA-4EA3-BFB2-7638F96A86C0 oper_url oper_url @@ -3019,7 +3357,7 @@ TableComment 0 新宋体,8,N varchar(255) 255 - + F2A56B63-7A56-43FA-8099-411F3578B30D oper_ip oper_ip @@ -3032,7 +3370,7 @@ TableComment 0 新宋体,8,N varchar(30) 30 - + 1EF1BAF6-F5C1-496C-98E0-8B10C37279A1 oper_param oper_param @@ -3045,7 +3383,7 @@ TableComment 0 新宋体,8,N varchar(255) 255 - + AA3F3A4E-D375-4232-B152-01DCFB8F6B6D status status @@ -3058,7 +3396,7 @@ TableComment 0 新宋体,8,N int(1) 1 - + 29E44D4A-6AC7-4220-A502-4BFC8746397A error_msg error_msg @@ -3071,7 +3409,7 @@ TableComment 0 新宋体,8,N varchar(2000) 2000 - + 22343C35-D913-485B-862E-2CEF579AAF22 oper_time oper_time @@ -3084,7 +3422,7 @@ TableComment 0 新宋体,8,N - + C0561C20-CC22-471B-A764-414C0D378FD6 Key_1 Key_1 @@ -3093,12 +3431,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -3107,10 +3445,12 @@ TableComment 0 新宋体,8,N sys_dict_type 1524449375 Administrator -1524449375 -Administrator +1538297703 +admin +字典类型表 + - + 79CB7D43-B999-4D92-9477-D3AFEBD94248 dict_id dict_id @@ -3124,7 +3464,7 @@ TableComment 0 新宋体,8,N 1 1 - + 2490B755-3E0A-4935-97F0-2EFDF9A72D05 dict_name dict_name @@ -3137,7 +3477,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 7421238A-82DB-4992-AA28-41726AB6A5D6 dict_type dict_type @@ -3150,20 +3490,20 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + 971D2FBD-1A24-4EE4-B943-9367609C7472 status status 1524449375 Administrator -1524449375 -Administrator +1538296458 +admin 状态（0正常 1禁用） 0 -int(1) +char(1) 1 - + B8876246-5BBA-4A03-86D7-98CA4EBEE342 create_by create_by @@ -3176,7 +3516,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 5237CED2-0853-41DE-ACF4-BE442BC9E112 create_time create_time @@ -3187,7 +3527,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 2CACFBC0-8349-4B3A-9183-208B18C9F56F update_by update_by @@ -3200,7 +3540,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + ABEE7806-4F61-4B97-980C-CA081F61CA7C update_time update_time @@ -3211,7 +3551,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + 3966B558-B911-45DE-86C6-57F3DB9267BA remark remark @@ -3224,7 +3564,7 @@ TableComment 0 新宋体,8,N varchar(500) 500 - + AFC0A0ED-A469-40B2-A6C4-4616444830AA unique unique @@ -3236,7 +3576,7 @@ TableComment 0 新宋体,8,N - + BAD40D8E-BC11-44F5-918E-B27CABBCB051 Key_1 Key_1 @@ -3245,12 +3585,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -3259,10 +3599,12 @@ TableComment 0 新宋体,8,N sys_dict_data 1524449375 Administrator -1524449375 -Administrator +1538297709 +admin +字典数据表 + - + CFDB23A8-AE38-4051-973A-2DABAC8283F9 dict_code dict_code @@ -3276,7 +3618,7 @@ TableComment 0 新宋体,8,N 1 1 - + EAA405BD-12A8-472F-A42D-CDA6A82E291A dict_sort dict_sort @@ -3289,7 +3631,7 @@ TableComment 0 新宋体,8,N int(4) 4 - + F13017F5-2AA0-4DE9-9DC2-A9A3D73A98E6 dict_label dict_label @@ -3302,7 +3644,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + EEEC4136-823D-4892-9BB9-BB0B4ADD83E3 dict_value dict_value @@ -3315,7 +3657,7 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + ADF5A383-D055-40BE-BBFC-06E2B93D4E6A dict_type dict_type @@ -3328,7 +3670,40 @@ TableComment 0 新宋体,8,N varchar(100) 100 - + +A0B2DDF2-251D-4701-9B00-6893C74CC449 +css_class +css_class +1538296497 +admin +1538296556 +admin +varchar(100) +100 + + +3CBFBA8E-7609-458D-9E53-A825C3F307A2 +list_class +list_class +1538296497 +admin +1538296556 +admin +varchar(100) +100 + + +BA974839-DEE0-4684-BBEF-6D7776C34354 +is_default +is_default +1538296497 +admin +1538296556 +admin +char(1) +1 + + 1676CDF5-01CA-4749-BA1D-6E5399257BD0 status status @@ -3341,7 +3716,7 @@ TableComment 0 新宋体,8,N int(1) 1 - + 8798B094-1AAF-4A23-B2F1-4C19DACF1AA3 create_by create_by @@ -3354,7 +3729,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + D1CB9293-D762-403C-85CB-4B974ACF7328 create_time create_time @@ -3365,7 +3740,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 5A34AF87-B25E-4349-9713-69DC50F6F5F2 update_by update_by @@ -3378,7 +3753,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 3204FBAC-1F61-4571-ADC4-BF1BE9CED85A update_time update_time @@ -3389,7 +3764,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + B7DE1842-809C-4401-9C80-C9A37DF9B053 remark remark @@ -3404,7 +3779,7 @@ TableComment 0 新宋体,8,N - + 2809F417-7FA5-48DA-B613-662C7C28061E Key_1 Key_1 @@ -3413,12 +3788,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -3427,10 +3802,12 @@ TableComment 0 新宋体,8,N sys_logininfor 1524449375 Administrator -1524449375 -Administrator +1538297756 +admin +系统访问记录 + - + 5CB5D942-D52B-487D-BC86-476481B0FB8D info_id info_id @@ -3444,7 +3821,7 @@ TableComment 0 新宋体,8,N 1 1 - + A1C66DBC-9DB7-428B-9275-3D014B6CE388 login_name login_name @@ -3457,7 +3834,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + 8E0F50A6-F98D-48B0-8D9D-78F3A76ED171 ipaddr ipaddr @@ -3470,7 +3847,18 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + +91B70723-1A7E-4277-A100-63B775A504B3 +login_location +login_location +1538297350 +admin +1538297369 +admin +varchar(255) +255 + + AA04F533-A044-428B-80F8-515B6BB1A302 browser browser @@ -3483,7 +3871,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + D37570E9-9EEE-4349-B875-494A5415C736 os os @@ -3496,7 +3884,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + CF10A80C-123E-42F3-A2DD-1B770E5F9D86 status status @@ -3509,7 +3897,7 @@ TableComment 0 新宋体,8,N int(1) 1 - + 9113784E-932A-4FAF-82CB-A75B8C827309 msg msg @@ -3522,7 +3910,7 @@ TableComment 0 新宋体,8,N varchar(255) 255 - + BCA519C6-19C9-45DF-A0B5-F88E9E6D3557 login_time login_time @@ -3535,7 +3923,7 @@ TableComment 0 新宋体,8,N - + C14E656C-0645-49EB-8B42-AD82232E0416 Key_1 Key_1 @@ -3544,12 +3932,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -3558,10 +3946,12 @@ TableComment 0 新宋体,8,N sys_user_online 1524449375 Administrator -1524449375 -Administrator +1538297754 +admin +在线用户记录 + - + 7FCC57CE-47DD-4948-B949-10401B2FC7B1 sessionId sessionId @@ -3575,7 +3965,7 @@ TableComment 0 新宋体,8,N 50 1 - + FDE5B59D-8CF7-4AAE-987F-3FF2AEBE22CB login_name login_name @@ -3588,7 +3978,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + AB65FF92-33A0-42C8-8B3F-454A1FAD5615 dept_name dept_name @@ -3601,7 +3991,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + C4DAF2D0-9CDC-476B-A011-FF5D302371EB ipaddr ipaddr @@ -3614,7 +4004,18 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + +C8243FB0-425B-4A74-9ADA-C93B15E713EA +login_location +login_location +1538297178 +admin +1538297216 +admin +varchar(255) +255 + + 89EC40B0-0C22-4811-90BB-BEA385ACDF20 browser browser @@ -3627,7 +4028,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + AC455631-CFE0-45BB-A0C5-788D695E4B6C os os @@ -3640,7 +4041,7 @@ TableComment 0 新宋体,8,N varchar(50) 50 - + 5C56E3C9-4591-4762-89E1-C9BBFECB5F11 status status @@ -3653,7 +4054,7 @@ TableComment 0 新宋体,8,N varchar(10) 10 - + 0CAF2F1F-459F-4F78-9075-D95F924A4FF7 start_timestamp start_timestamp @@ -3664,7 +4065,7 @@ TableComment 0 新宋体,8,N session创建时间 timestamp - + 6AE6BDED-823E-4455-9A9F-338EC6F7BDB9 last_access_time last_access_time @@ -3675,7 +4076,7 @@ TableComment 0 新宋体,8,N session最后访问时间 timestamp - + CE390924-4628-421C-979F-002C2952E99E expire_time expire_time @@ -3690,7 +4091,7 @@ TableComment 0 新宋体,8,N - + 365CC94D-6124-42C7-96BD-376B84B709F7 Key_1 Key_1 @@ -3699,12 +4100,12 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + - + @@ -3713,10 +4114,12 @@ TableComment 0 新宋体,8,N sys_job 1524449375 Administrator -1524449375 -Administrator +1538297732 +admin +定时任务调度表 + - + 1658CED4-3885-4094-AB70-F35408EBCD5E job_id job_id @@ -3730,7 +4133,7 @@ TableComment 0 新宋体,8,N 1 1 - + 731E7147-E3A4-4D93-8C7C-BB1C6D94DB9E job_name job_name @@ -3744,7 +4147,7 @@ TableComment 0 新宋体,8,N 64 1 - + C64B3655-C240-44F0-83B4-F42FB76C8BEA job_group job_group @@ -3758,7 +4161,7 @@ TableComment 0 新宋体,8,N 64 1 - + 9F7E735D-B823-4ADA-BA3D-8FFFFEC92F5C method_name method_name @@ -3771,20 +4174,20 @@ TableComment 0 新宋体,8,N varchar(500) 500 - + 28EEE4F4-E8E7-4052-8F10-88D6C74C595D -params -params +method_params +method_params 1524449375 Administrator -1524449375 -Administrator +1538297298 +admin 方法参数 '' varchar(200) 200 - + C8986FAD-E2E7-4364-9E8B-B75366B9A4ED cron_expression cron_expression @@ -3797,7 +4200,18 @@ TableComment 0 新宋体,8,N varchar(255) 255 - + +FD188167-AC02-4161-BE89-D63E61412313 +misfire_policy +misfire_policy +1538297273 +admin +1538297298 +admin +varchar(20) +20 + + 2D4B6C8F-EEE8-4474-9D20-8206A7E80362 status status @@ -3810,7 +4224,7 @@ TableComment 0 新宋体,8,N int(1) 1 - + CA78AC7F-19E7-47BC-BF7B-9F31EFB02702 create_by create_by @@ -3823,7 +4237,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + B8F807AE-9F19-4FCA-BA98-7BF71DD0CA02 create_time create_time @@ -3834,7 +4248,7 @@ TableComment 0 新宋体,8,N 创建时间 timestamp - + 3FBB42FA-ED0F-4D7C-99D0-5F7AF7B0F1DD update_by update_by @@ -3847,7 +4261,7 @@ TableComment 0 新宋体,8,N varchar(64) 64 - + 1C5863D2-A8B9-43DB-AA06-F8BE3E01093B update_time update_time @@ -3858,7 +4272,7 @@ TableComment 0 新宋体,8,N 更新时间 timestamp - + 889C3FF9-BB1E-4EB1-AFE9-1D1155984915 remark remark @@ -3873,7 +4287,7 @@ TableComment 0 新宋体,8,N - + 38106F1A-4FFB-4EC0-B979-55BD6C6C6FF7 Key_1 Key_1 @@ -3882,14 +4296,14 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - - - + + + - + @@ -3898,10 +4312,12 @@ TableComment 0 新宋体,8,N sys_job_log 1524449375 Administrator -1524449375 -Administrator +1538297742 +admin +定时任务调度日志表 + - + 308F32A1-A8EC-4002-9993-DF9234A303B7 job_log_id job_log_id @@ -3915,7 +4331,7 @@ TableComment 0 新宋体,8,N 1 1 - + F4D55B65-BB6B-4182-A6D6-F9CAABC19110 job_name job_name @@ -3928,7 +4344,7 @@ TableComment 0 新宋体,8,N 64 1 - + 8AF383A0-01C0-4947-8384-FF0F13AC00AE job_group job_group @@ -3941,7 +4357,7 @@ TableComment 0 新宋体,8,N 64 1 - + 96582B76-F1E9-4473-BA51-01B87B5F459E method_name method_name @@ -3953,20 +4369,20 @@ TableComment 0 新宋体,8,N varchar(500) 500 - + 2AB02ABA-02E3-4F72-95BA-4261A7F5729A -params -params +method_params +method_params 1524449375 Administrator -1524449375 -Administrator +1538297325 +admin 方法参数 '' varchar(200) 200 - + 8EB39444-CBFF-43AA-AA37-49217EF545B6 job_message job_message @@ -3978,20 +4394,20 @@ TableComment 0 新宋体,8,N varchar(500) 500 - + 18CD263C-0F57-4EDF-999E-1B5A7EE2BFF9 is_exception is_exception 1524449375 Administrator -1524449375 -Administrator +1538297325 +admin 是否异常 0 -int(1) +char(1) 1 - + 634ECD78-2251-43EB-B6CF-DF7FA9DA4354 exception_info exception_info @@ -4002,7 +4418,7 @@ TableComment 0 新宋体,8,N 异常信息 text - + 4EC075CC-507B-43D7-860F-34DAAEB1DBBF create_time create_time @@ -4015,7 +4431,7 @@ TableComment 0 新宋体,8,N - + A87DCE10-894A-4CF7-B39C-AF18202C7F86 Key_1 Key_1 @@ -4024,17 +4440,384 @@ TableComment 0 新宋体,8,N 1524449375 Administrator - + + + + + + + + + +FD6284E8-B6D4-43AF-A038-9C97DCD403DC +sys_role_dept +sys_role_dept +1538296083 +admin +1538297689 +admin +角色和部门关联表 + + + +2BC66204-4193-42E6-BB7B-7AD57C9E5BEF +role_id +role_id +1538296083 +admin +1538296150 +admin +用户ID +int(11) +11 +1 + + +A32BC025-6437-41AB-BAA4-3A150E406781 +dept_id +dept_id +1538296083 +admin +1538296150 +admin +岗位ID +int(11) +11 +1 + + + + +315FFED5-B0A0-4649-8255-2283896340C9 +Key_1 +Key_1 +1538296083 +admin +1538296083 +admin + + + + + + + + + + + +45EB995C-F5F6-4818-AEB1-2038DEBA9CEE +sys_config +sys_config +1538296587 +admin +1538297714 +admin +参数配置表 + + + +667C4616-146B-475C-8111-4720375D762C +config_id +config_id +1538296587 +admin +1538296691 +admin +字典编码 +int(5) +5 +1 +1 + + +EA798E0B-0CBE-4897-B0AF-1F2D3CD6DEF4 +config_name +config_name +1538296587 +admin +1538296691 +admin +字典排序 +0 +varchar(100) +100 + + +A9A2A6E0-C914-4516-AE4C-F33CE71B92E8 +config_key +config_key +1538296587 +admin +1538296691 +admin +字典标签 +'' +varchar(100) +100 + + +24CCA897-8671-402E-8229-9ED0C80C176A +config_value +config_value +1538296587 +admin +1538296691 +admin +字典键值 +'' +varchar(100) +100 + + +B4E76B1D-BFAF-42F3-8CCA-8B5A8CC7CBFF +config_type +config_type +1538296587 +admin +1538296691 +admin +字典类型 +'' +char(1) +1 + + +A6AC1891-F5C4-45B3-8CAB-8F4CE8B8BF08 +create_by +create_by +1538296587 +admin +1538296587 +admin +创建者 +'' +varchar(64) +64 + + +CC1E0367-A079-49A0-8F0A-FE5F7B3EB6EA +create_time +create_time +1538296587 +admin +1538296587 +admin +创建时间 +timestamp + + +081CD54E-AE38-4696-A326-F829B8EA5737 +update_by +update_by +1538296587 +admin +1538296587 +admin +更新者 +'' +varchar(64) +64 + + +E2118ECE-8F52-4FBA-B18A-F30FFB2BDD20 +update_time +update_time +1538296587 +admin +1538296587 +admin +更新时间 +timestamp + + +55A16121-8932-465E-8427-EBDA39B2B900 +remark +remark +1538296587 +admin +1538296587 +admin +备注 +'' +varchar(500) +500 + + + + +0F331278-2804-496A-A87B-B0944C80FB82 +Key_1 +Key_1 +1538296587 +admin +1538296587 +admin + + - + + + + +F33DE1D6-C12D-43DB-A502-83BD1615F081 +sys_notice +sys_notice +1538297386 +admin +1538297746 +admin +通知公告表 + + + +FF4A9744-D7CA-450E-8AD7-B3E7E90075CE +notice_id +notice_id +1538297386 +admin +1538297496 +admin +任务日志ID +int(4) +4 +1 +1 + + +E2B08825-4C94-4209-80B2-21A7AD8CBF2D +notice_title +notice_title +1538297386 +admin +1538297496 +admin +任务名称 +varchar(50) +50 +1 + + +04414862-9ABC-4431-B1B7-B44ECC08CB6E +notice_type +notice_type +1538297386 +admin +1538297496 +admin +任务组名 +char(2) +2 +1 + + +E829DAD1-E3F9-4AED-A3DE-59CE4340333E +notice_content +notice_content +1538297386 +admin +1538297496 +admin +任务方法 +varchar(500) +500 + + +2EABC8DB-6700-4717-89A3-31461C4CB2D5 +status +status +1538297386 +admin +1538297496 +admin +方法参数 +'' +char(1) +1 + + +448D3EB6-DE24-4BE3-9C29-1FC3C71B0E8D +create_by +create_by +1538297386 +admin +1538297496 +admin +日志信息 +varchar(64) +64 + + +770ED87D-D4D7-499C-A266-7A54051B1A84 +create_time1 +create_time1 +1538297386 +admin +1538297496 +admin +是否异常 +0 +datetime + + +12DDF399-7CCB-4117-8B05-6AA9BEE845E5 +update_by +update_by +1538297386 +admin +1538297496 +admin +异常信息 +varchar(64) +64 + + +FE101CE4-9B66-4097-944D-36B01A9E2219 +update_time1 +update_time1 +1538297400 +admin +1538297496 +admin +datetime + + +D5F1728C-01D0-4C00-9AD6-AAA14228104B +remark +remark +1538297386 +admin +1538297496 +admin +创建时间 +varchar(255) +255 + + + + +43C7AC1D-CE7A-4B55-A474-8CB2376D446F +Key_1 +Key_1 +1538297386 +admin +1538297386 +admin + + + + + + + - + F2EBEA5B-F352-45CB-B349-39158064CEE8 PUBLIC PUBLIC @@ -4045,14 +4828,14 @@ TableComment 0 新宋体,8,N - + 41740AEF-D7FB-4738-ABDF-47C3287A6AF6 MySQL 5.0 MYSQL50 1524449337 Administrator -1524449337 -Administrator +1538295558 +admin file:///%_DBMS%/mysql50.xdb F4F16ECD-F2F1-4006-AF6F-638D5C65F35E 4BA9F647-DAB1-11D1-9944-006097355D9B diff --git a/sql/ry_20180903.sql b/sql/ry_20180903.sql index 1632154e..a2b856d6 100644 --- a/sql/ry_20180903.sql +++ b/sql/ry_20180903.sql @@ -374,8 +374,8 @@ insert into sys_role_dept values ('2', '105'); drop table if exists sys_user_post; create table sys_user_post ( - user_id varchar(64) not null comment '用户ID', - post_id varchar(64) not null comment '岗位ID', + user_id int(11) not null comment '用户ID', + post_id int(11) not null comment '岗位ID', primary key (user_id, post_id) ) engine=innodb default charset=utf8 comment = '用户与岗位关联表'; @@ -450,8 +450,8 @@ create table sys_dict_data dict_label varchar(100) default '' comment '字典标签', dict_value varchar(100) default '' comment '字典键值', dict_type varchar(100) default '' comment '字典类型', - css_class varchar(500) default '' comment '样式属性（其他样式扩展）', - list_class varchar(500) default '' comment '表格回显样式', + css_class varchar(100) default '' comment '样式属性（其他样式扩展）', + list_class varchar(100) default '' comment '表格回显样式', is_default char(1) default 'N' comment '是否默认（Y是 N否）', status char(1) default '0' comment '状态（0正常 1停用）', create_by varchar(64) default '' comment '创建者', diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java new file mode 100644 index 00000000..903d7114 --- /dev/null +++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -0,0 +1,122 @@ +package com.ruoyi.framework.aspectj; + +import java.lang.reflect.Method; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.Signature; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.stereotype.Component; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.security.ShiroUtils; +import com.ruoyi.framework.aspectj.lang.annotation.DataScope; +import com.ruoyi.framework.web.domain.BaseEntity; +import com.ruoyi.project.system.role.domain.Role; +import com.ruoyi.project.system.user.domain.User; + +/** + * 数据过滤处理 + * + * @author ruoyi + */ +@Aspect +@Component +public class DataScopeAspect +{ + /** + * 全部数据权限 + */ + public static final String DATA_SCOPE_ALL = "1"; + + /** + * 自定数据权限 + */ + public static final String DATA_SCOPE_CUSTOM = "2"; + + /** + * 数据权限过滤关键字 + */ + public static final String DATA_SCOPE = "dataScope"; + + // 配置织入点 + @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)") + public void dataScopePointCut() + { + } + + @Before("dataScopePointCut()") + public void doBefore(JoinPoint point) throws Throwable + { + handleDataScope(point); + } + + protected void handleDataScope(final JoinPoint joinPoint) + { + // 获得注解 + DataScope controllerDataScope = getAnnotationLog(joinPoint); + if (controllerDataScope == null) + { + return; + } + // 获取当前的用户 + User currentUser = ShiroUtils.getUser(); + if (currentUser != null) + { + // 如果是超级管理员，则不过滤数据 + if (!currentUser.isAdmin()) + { + dataScopeFilter(joinPoint, currentUser, controllerDataScope.tableAlias()); + } + } + } + + /** + * 数据范围过滤 + * + * @param da 部门表别名 + * @return 标准连接条件对象 + */ + public static void dataScopeFilter(JoinPoint joinPoint, User user, String alias) + { + StringBuilder sqlString = new StringBuilder(); + + for (Role role : user.getRoles()) + { + String dataScope = role.getDataScope(); + if (DATA_SCOPE_ALL.equals(dataScope)) + { + sqlString = new StringBuilder(); + break; + } + else if (DATA_SCOPE_CUSTOM.equals(dataScope)) + { + sqlString.append(StringUtils.format( + " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", alias, + role.getRoleId())); + } + } + + if (StringUtils.isNotBlank(sqlString.toString())) + { + BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0]; + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); + } + } + + /** + * 是否存在注解，如果存在就获取 + */ + private DataScope getAnnotationLog(JoinPoint joinPoint) + { + Signature signature = joinPoint.getSignature(); + MethodSignature methodSignature = (MethodSignature) signature; + Method method = methodSignature.getMethod(); + + if (method != null) + { + return method.getAnnotation(DataScope.class); + } + return null; + } +} diff --git a/src/main/java/com/ruoyi/framework/aspectj/DsAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java similarity index 88% rename from src/main/java/com/ruoyi/framework/aspectj/DsAspect.java rename to src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java index 6b3611c1..a6862655 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DsAspect.java +++ b/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Ds; +import com.ruoyi.framework.aspectj.lang.annotation.DataSource; import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; /** @@ -22,11 +22,11 @@ import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; @Aspect @Order(1) @Component -public class DsAspect +public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Ds)") + @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)") public void dsPointCut() { @@ -39,7 +39,7 @@ public class DsAspect Method method = signature.getMethod(); - Ds dataSource = method.getAnnotation(Ds.class); + DataSource dataSource = method.getAnnotation(DataSource.class); if (StringUtils.isNotNull(dataSource)) { diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java new file mode 100644 index 00000000..6965e894 --- /dev/null +++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java @@ -0,0 +1,21 @@ +package com.ruoyi.framework.aspectj.lang.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 数据权限过滤注解 + * + * @author ruoyi + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataScope +{ + /** 表的别名 */ + String tableAlias() default ""; +} diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Ds.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java similarity index 94% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Ds.java rename to src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java index 5dd04439..89ec9ec5 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Ds.java +++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java @@ -14,7 +14,7 @@ import com.ruoyi.framework.aspectj.lang.enums.DataSourceType; */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) -public @interface Ds +public @interface DataSource { /** * 切换数据源名称 diff --git a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java index 9ad35eb3..4e505087 100644 --- a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java @@ -32,7 +32,7 @@ public class ResourcesConfig implements WebMvcConfigurer @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - /** 头像上传路径 */ + /** 文件上传路径 */ registry.addResourceHandler("/profile/**").addResourceLocations("file:" + RuoYiConfig.getProfile()); /** swagger配置 */ diff --git a/src/main/java/com/ruoyi/framework/datascope/DataScopeUtils.java b/src/main/java/com/ruoyi/framework/datascope/DataScopeUtils.java deleted file mode 100644 index 5165b485..00000000 --- a/src/main/java/com/ruoyi/framework/datascope/DataScopeUtils.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.ruoyi.framework.datascope; - -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.project.system.role.domain.Role; -import com.ruoyi.project.system.user.domain.User; - -/** - * 数据范围处理 - * - * @author ruoyi - */ -public class DataScopeUtils -{ - /** - * 全部数据权限 - */ - public static final String DATA_SCOPE_ALL = "1"; - - /** - * 自定数据权限 - */ - public static final String DATA_SCOPE_CUSTOM = "2"; - - /** - * 数据范围过滤 - * - * @return 标准连接条件对象 - */ - public static String dataScopeFilter() - { - return dataScopeFilter("u"); - } - - /** - * 数据范围过滤 - * - * @param da 部门表别名 - * @return 标准连接条件对象 - */ - public static String dataScopeFilter(String da) - { - User user = ShiroUtils.getUser(); - // 如果是超级管理员，则不过滤数据 - if (user.isAdmin()) - { - return StringUtils.EMPTY; - } - - StringBuilder sqlString = new StringBuilder(); - - for (Role role : user.getRoles()) - { - String dataScope = role.getDataScope(); - if (DATA_SCOPE_ALL.equals(dataScope)) - { - sqlString = new StringBuilder(); - break; - } - else if (DATA_SCOPE_CUSTOM.equals(dataScope)) - { - sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", da, role.getRoleId())); - } - } - - if (StringUtils.isNotBlank(sqlString.toString())) - { - return " AND (" + sqlString.substring(4) + ")"; - } - return StringUtils.EMPTY; - } -} diff --git a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java index 033b31f7..c42cb8bf 100644 --- a/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/dept/service/DeptServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.framework.datascope.DataScopeUtils; +import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.project.system.dept.domain.Dept; import com.ruoyi.project.system.dept.mapper.DeptMapper; import com.ruoyi.project.system.role.domain.Role; @@ -31,9 +31,9 @@ public class DeptServiceImpl implements IDeptService * @return 部门信息集合 */ @Override + @DataScope(tableAlias = "d") public List selectDeptList(Dept dept) { - dept.getParams().put("dataScope", DataScopeUtils.dataScopeFilter("d")); return deptMapper.selectDeptList(dept); } diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java index fce6ede2..f1c833e3 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java @@ -11,7 +11,7 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.support.Convert; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.framework.datascope.DataScopeUtils; +import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.project.system.role.domain.Role; import com.ruoyi.project.system.role.domain.RoleDept; import com.ruoyi.project.system.role.domain.RoleMenu; @@ -48,9 +48,9 @@ public class RoleServiceImpl implements IRoleService * @return 角色数据集合信息 */ @Override + @DataScope(tableAlias = "u") public List selectRoleList(Role role) { - role.getParams().put("dataScope", DataScopeUtils.dataScopeFilter()); return roleMapper.selectRoleList(role); } diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index c30b69f4..b5e114b9 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.support.Convert; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; -import com.ruoyi.framework.datascope.DataScopeUtils; +import com.ruoyi.framework.aspectj.lang.annotation.DataScope; import com.ruoyi.framework.shiro.service.PasswordService; import com.ruoyi.project.system.post.domain.Post; import com.ruoyi.project.system.post.mapper.PostMapper; @@ -55,10 +55,10 @@ public class UserServiceImpl implements IUserService * @return 用户信息集合信息 */ @Override + @DataScope(tableAlias = "u") public List selectUserList(User user) { // 生成数据权限过滤条件 - user.getParams().put("dataScope", DataScopeUtils.dataScopeFilter()); return userMapper.selectUserList(user); }