Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzuaa
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzuaa
提交
07458e3e
提交
07458e3e
编写于
7月 01, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong@lab.ibiz5.com 部署微服务应用
上级
db64a611
变更
20
隐藏空白字符变更
内嵌
并排
正在显示
20 个修改的文件
包含
175 行增加
和
124 行删除
+175
-124
filter-tree.less
app_web/src/components/filter-tree/filter-tree.less
+12
-1
filter-tree.vue
app_web/src/components/filter-tree/filter-tree.vue
+2
-2
sys-app-service-base.ts
app_web/src/service/sys-app/sys-app-service-base.ts
+8
-12
sys-auth-log-service-base.ts
...web/src/service/sys-auth-log/sys-auth-log-service-base.ts
+8
-12
sys-permission-service-base.ts
...src/service/sys-permission/sys-permission-service-base.ts
+8
-12
sys-role-permission-service-base.ts
...e/sys-role-permission/sys-role-permission-service-base.ts
+26
-18
sys-role-service-base.ts
app_web/src/service/sys-role/sys-role-service-base.ts
+8
-12
sys-user-role-service-base.ts
...b/src/service/sys-user-role/sys-user-role-service-base.ts
+26
-18
sys-user-service-base.ts
app_web/src/service/sys-user/sys-user-service-base.ts
+8
-12
SysPSSystemExService.java
...ibizlab/core/extensions/service/SysPSSystemExService.java
+45
-0
ISysAuthLogService.java
.../java/cn/ibizlab/core/uaa/service/ISysAuthLogService.java
+0
-2
ISysPSSystemService.java
...java/cn/ibizlab/core/uaa/service/ISysPSSystemService.java
+0
-2
ISysPermissionService.java
...va/cn/ibizlab/core/uaa/service/ISysPermissionService.java
+0
-2
ISysRolePermissionService.java
...n/ibizlab/core/uaa/service/ISysRolePermissionService.java
+0
-2
ISysRoleService.java
...ain/java/cn/ibizlab/core/uaa/service/ISysRoleService.java
+0
-2
ISysUserRoleService.java
...java/cn/ibizlab/core/uaa/service/ISysUserRoleService.java
+0
-2
ISysUserService.java
...ain/java/cn/ibizlab/core/uaa/service/ISysUserService.java
+0
-2
SysAppServiceImpl.java
...a/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java
+0
-4
DEFieldDefaultValueAspect.java
...ava/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
+1
-1
VersionCheckAspect.java
.../main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java
+23
-6
未找到文件。
app_web/src/components/filter-tree/filter-tree.less
浏览文件 @
07458e3e
...
...
@@ -3,6 +3,7 @@
height: 40px;
.filter-tree-item {
display: flex;
width: 100%;
>div {
margin-right: 10px;
}
...
...
@@ -10,10 +11,20 @@
margin-right: 0;
}
.filter-tree-action {
margin-left: 20px;
display: none;
align-items: center;
.ivu-btn {
margin-right: 5px;
}
.ivu-icon-md-close {
color: red;
font-size: 24px;
}
}
}
.filter-tree-item:hover {
.filter-tree-action {
display: flex;
}
}
}
...
...
app_web/src/components/filter-tree/filter-tree.vue
浏览文件 @
07458e3e
...
...
@@ -9,7 +9,7 @@
<div
class=
"filter-tree-action"
>
<i-button
title=
"添加条件"
@
click=
"onAddItem(data)"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
添加条件
</i-button>
<i-button
title=
"添加组"
@
click=
"onAddGroup(data)"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
添加组
</i-button>
<i
-button
v-if=
"!data.isroot"
@
click=
"onRemoveItem(node, data)"
title=
"删除"
><i
class=
"fa fa-trash-o"
aria-hidden=
"true"
></i></i-button
>
<i
con
v-if=
"!data.isroot"
type=
"md-close"
@
click=
"onRemoveItem(node, data)"
/
>
</div>
</div>
</
template
>
...
...
@@ -29,7 +29,7 @@
<slot
v-else
:data=
"data"
></slot>
</div>
<div
class=
"filter-tree-action"
>
<i
-button
@
click=
"onRemoveItem(node, data)"
title=
"删除"
><i
class=
"fa fa-trash-o"
aria-hidden=
"true"
></i></i-button
>
<i
con
type=
"md-close"
@
click=
"onRemoveItem(node, data)"
/
>
</div>
</div>
</
template
>
...
...
app_web/src/service/sys-app/sys-app-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -48,8 +48,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysapps/
${
context
.
sysapp
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysapps/
${
context
.
sysapp
}
/select`
,
isloading
);
}
/**
...
...
@@ -88,7 +87,7 @@ export default class SysAppServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysapps/
${
context
.
sysapp
}
`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -101,8 +100,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysapps/
${
context
.
sysapp
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysapps/
${
context
.
sysapp
}
`
,
isloading
);
}
/**
...
...
@@ -115,8 +113,8 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysapps/
${
context
.
sysapp
}
`
,
isloading
);
return
res
;
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysapps/
${
context
.
sysapp
}
`
,
isloading
);
return
res
;
}
/**
...
...
@@ -144,8 +142,7 @@ export default class SysAppServiceBase extends EntityService {
* @memberof SysAppServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysapps/
${
context
.
sysapp
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysapps/
${
context
.
sysapp
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -161,7 +158,7 @@ export default class SysAppServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysapps/
${
context
.
sysapp
}
/save`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -175,7 +172,6 @@ export default class SysAppServiceBase extends EntityService {
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysapps/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysapps/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-auth-log/sys-auth-log-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -48,8 +48,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysauthlogs/
${
context
.
sysauthlog
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysauthlogs/
${
context
.
sysauthlog
}
/select`
,
isloading
);
}
/**
...
...
@@ -88,7 +87,7 @@ export default class SysAuthLogServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysauthlogs/
${
context
.
sysauthlog
}
`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -101,8 +100,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysauthlogs/
${
context
.
sysauthlog
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysauthlogs/
${
context
.
sysauthlog
}
`
,
isloading
);
}
/**
...
...
@@ -115,8 +113,8 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysauthlogs/
${
context
.
sysauthlog
}
`
,
isloading
);
return
res
;
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysauthlogs/
${
context
.
sysauthlog
}
`
,
isloading
);
return
res
;
}
/**
...
...
@@ -144,8 +142,7 @@ export default class SysAuthLogServiceBase extends EntityService {
* @memberof SysAuthLogServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysauthlogs/
${
context
.
sysauthlog
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysauthlogs/
${
context
.
sysauthlog
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -161,7 +158,7 @@ export default class SysAuthLogServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysauthlogs/
${
context
.
sysauthlog
}
/save`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -175,7 +172,6 @@ export default class SysAuthLogServiceBase extends EntityService {
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysauthlogs/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysauthlogs/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-permission/sys-permission-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -48,8 +48,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/select`
,
isloading
);
}
/**
...
...
@@ -120,7 +119,7 @@ export default class SysPermissionServiceBase extends EntityService {
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/syspermissions/
${
context
.
syspermission
}
`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
return
res
;
return
res
;
}
/**
...
...
@@ -133,8 +132,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/syspermissions/
${
context
.
syspermission
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/syspermissions/
${
context
.
syspermission
}
`
,
isloading
);
}
/**
...
...
@@ -147,9 +145,9 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
`
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
`
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
return
res
;
return
res
;
}
/**
...
...
@@ -178,8 +176,7 @@ export default class SysPermissionServiceBase extends EntityService {
* @memberof SysPermissionServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -211,7 +208,7 @@ export default class SysPermissionServiceBase extends EntityService {
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/save`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
return
res
;
return
res
;
}
/**
...
...
@@ -225,7 +222,6 @@ export default class SysPermissionServiceBase extends EntityService {
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/syspermissions/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-role-permission/sys-role-permission-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -49,13 +49,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysrole
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
/select`
,
isloading
);
}
/**
...
...
@@ -79,6 +78,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
syspermission
&&
true
){
let
masterData
:
any
=
{};
...
...
@@ -91,6 +91,7 @@ export default class SysRolePermissionServiceBase extends EntityService {
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
...
...
@@ -119,16 +120,18 @@ export default class SysRolePermissionServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -142,13 +145,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysrole
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
Http
.
getInstance
().
delete
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
}
/**
...
...
@@ -163,12 +165,14 @@ export default class SysRolePermissionServiceBase extends EntityService {
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysrole
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
res
;
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
res
;
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
`
,
isloading
);
return
res
;
}
/**
...
...
@@ -184,10 +188,12 @@ export default class SysRolePermissionServiceBase extends EntityService {
if
(
context
.
sysrole
&&
true
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/getdraft`
,
isloading
);
res
.
data
.
sysrolepermission
=
data
.
sysrolepermission
;
return
res
;
}
if
(
context
.
syspermission
&&
true
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/getdraft`
,
isloading
);
res
.
data
.
sysrolepermission
=
data
.
sysrolepermission
;
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysrolepermissions/getdraft`
,
isloading
);
res
.
data
.
sysrolepermission
=
data
.
sysrolepermission
;
...
...
@@ -208,14 +214,15 @@ export default class SysRolePermissionServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/checkkey`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/checkkey`
,
data
,
isloading
);
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -232,16 +239,18 @@ export default class SysRolePermissionServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/save`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
syspermission
&&
context
.
sysrolepermission
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/
${
context
.
sysrolepermission
}
/save`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysrolepermissions/
${
context
.
sysrolepermission
}
/save`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -256,14 +265,13 @@ export default class SysRolePermissionServiceBase extends EntityService {
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysrole
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
}
if
(
context
.
syspermission
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/syspermissions/
${
context
.
syspermission
}
/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
}
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysrolepermissions/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-role/sys-role-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -48,8 +48,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/select`
,
isloading
);
}
/**
...
...
@@ -152,7 +151,7 @@ export default class SysRoleServiceBase extends EntityService {
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysroles/
${
context
.
sysrole
}
`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -165,8 +164,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
`
,
isloading
);
}
/**
...
...
@@ -179,10 +177,10 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
`
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
`
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -212,8 +210,7 @@ export default class SysRoleServiceBase extends EntityService {
* @memberof SysRoleServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -261,7 +258,7 @@ export default class SysRoleServiceBase extends EntityService {
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/save`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysrolepermissions'
,
JSON
.
stringify
(
res
.
data
.
sysrolepermissions
));
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -275,7 +272,6 @@ export default class SysRoleServiceBase extends EntityService {
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysroles/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-user-role/sys-user-role-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -49,13 +49,12 @@ export default class SysUserRoleServiceBase extends EntityService {
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysuser
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysuserroles/
${
context
.
sysuserrole
}
/select`
,
isloading
);
}
/**
...
...
@@ -79,6 +78,7 @@ export default class SysUserRoleServiceBase extends EntityService {
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
sysrole
&&
true
){
let
masterData
:
any
=
{};
...
...
@@ -91,6 +91,7 @@ export default class SysUserRoleServiceBase extends EntityService {
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
...
...
@@ -119,16 +120,18 @@ export default class SysUserRoleServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysuserroles/
${
context
.
sysuserrole
}
`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -142,13 +145,12 @@ export default class SysUserRoleServiceBase extends EntityService {
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysuser
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
Http
.
getInstance
().
delete
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
Http
.
getInstance
().
delete
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
}
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
}
/**
...
...
@@ -163,12 +165,14 @@ export default class SysUserRoleServiceBase extends EntityService {
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysuser
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
res
;
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
res
;
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysuserroles/
${
context
.
sysuserrole
}
`
,
isloading
);
return
res
;
}
/**
...
...
@@ -184,10 +188,12 @@ export default class SysUserRoleServiceBase extends EntityService {
if
(
context
.
sysuser
&&
true
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/getdraft`
,
isloading
);
res
.
data
.
sysuserrole
=
data
.
sysuserrole
;
return
res
;
}
if
(
context
.
sysrole
&&
true
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/getdraft`
,
isloading
);
res
.
data
.
sysuserrole
=
data
.
sysuserrole
;
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysuserroles/getdraft`
,
isloading
);
res
.
data
.
sysuserrole
=
data
.
sysuserrole
;
...
...
@@ -208,14 +214,15 @@ export default class SysUserRoleServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
/checkkey`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
/checkkey`
,
data
,
isloading
);
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysuserroles/
${
context
.
sysuserrole
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysuserroles/
${
context
.
sysuserrole
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -232,16 +239,18 @@ export default class SysUserRoleServiceBase extends EntityService {
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/
${
context
.
sysuserrole
}
/save`
,
data
,
isloading
);
return
res
;
}
if
(
context
.
sysrole
&&
context
.
sysuserrole
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/
${
context
.
sysuserrole
}
/save`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysuserroles/
${
context
.
sysuserrole
}
/save`
,
data
,
isloading
);
return
res
;
return
res
;
}
/**
...
...
@@ -256,14 +265,13 @@ export default class SysUserRoleServiceBase extends EntityService {
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
sysuser
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
}
if
(
context
.
sysrole
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
return
Http
.
getInstance
().
get
(
`/sysroles/
${
context
.
sysrole
}
/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
}
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysuserroles/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
app_web/src/service/sys-user/sys-user-service-base.ts
浏览文件 @
07458e3e
...
...
@@ -48,8 +48,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/select`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
/select`
,
isloading
);
}
/**
...
...
@@ -120,7 +119,7 @@ export default class SysUserServiceBase extends EntityService {
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/sysusers/
${
context
.
sysuser
}
`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -133,8 +132,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
delete
(
`/sysusers/
${
context
.
sysuser
}
`
,
isloading
);
return
res
;
return
Http
.
getInstance
().
delete
(
`/sysusers/
${
context
.
sysuser
}
`
,
isloading
);
}
/**
...
...
@@ -147,9 +145,9 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
`
,
isloading
);
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/
${
context
.
sysuser
}
`
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -178,8 +176,7 @@ export default class SysUserServiceBase extends EntityService {
* @memberof SysUserServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/checkkey`
,
data
,
isloading
);
return
res
;
return
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/checkkey`
,
data
,
isloading
);
}
/**
...
...
@@ -211,7 +208,7 @@ export default class SysUserServiceBase extends EntityService {
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/sysusers/
${
context
.
sysuser
}
/save`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_sysuserroles'
,
JSON
.
stringify
(
res
.
data
.
sysuserroles
));
return
res
;
return
res
;
}
/**
...
...
@@ -225,7 +222,6 @@ export default class SysUserServiceBase extends EntityService {
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/sysusers/fetchdefault`
,
tempData
,
isloading
);
return
res
;
return
Http
.
getInstance
().
get
(
`/sysusers/fetchdefault`
,
tempData
,
isloading
);
}
}
\ No newline at end of file
ibzuaa-core/src/main/java/cn/ibizlab/core/extensions/service/SysPSSystemExService.java
0 → 100644
浏览文件 @
07458e3e
package
cn
.
ibizlab
.
core
.
extensions
.
service
;
import
cn.ibizlab.core.uaa.service.impl.SysPSSystemServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
import
cn.ibizlab.core.uaa.domain.SysPSSystem
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.context.annotation.Primary
;
import
java.util.*
;
/**
* 实体[系统] 自定义服务对象
*/
@Slf4j
@Primary
@Service
(
"SysPSSystemExService"
)
public
class
SysPSSystemExService
extends
SysPSSystemServiceImpl
{
@Override
protected
Class
currentModelClass
()
{
return
com
.
baomidou
.
mybatisplus
.
core
.
toolkit
.
ReflectionKit
.
getSuperClassGenericType
(
this
.
getClass
().
getSuperclass
(),
1
);
}
/**
* 自定义行为[PrepareApps]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public
SysPSSystem
prepareApps
(
SysPSSystem
et
)
{
return
super
.
prepareApps
(
et
);
}
/**
* 自定义行为[SyncPermission]用户扩展
* @param et
* @return
*/
@Override
@Transactional
public
SysPSSystem
syncPermission
(
SysPSSystem
et
)
{
return
super
.
syncPermission
(
et
);
}
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysAuthLogService.java
浏览文件 @
07458e3e
...
...
@@ -52,8 +52,6 @@ public interface ISysAuthLogService extends IService<SysAuthLog>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysPSSystemService.java
浏览文件 @
07458e3e
...
...
@@ -55,8 +55,6 @@ public interface ISysPSSystemService extends IService<SysPSSystem>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysPermissionService.java
浏览文件 @
07458e3e
...
...
@@ -52,8 +52,6 @@ public interface ISysPermissionService extends IService<SysPermission>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysRolePermissionService.java
浏览文件 @
07458e3e
...
...
@@ -56,8 +56,6 @@ public interface ISysRolePermissionService extends IService<SysRolePermission>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysRoleService.java
浏览文件 @
07458e3e
...
...
@@ -56,8 +56,6 @@ public interface ISysRoleService extends IService<SysRole>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysUserRoleService.java
浏览文件 @
07458e3e
...
...
@@ -56,8 +56,6 @@ public interface ISysUserRoleService extends IService<SysUserRole>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysUserService.java
浏览文件 @
07458e3e
...
...
@@ -56,8 +56,6 @@ public interface ISysUserService extends IService<SysUser>{
*/
boolean
execute
(
String
sql
,
Map
param
);
}
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAppServiceImpl.java
浏览文件 @
07458e3e
...
...
@@ -45,7 +45,6 @@ public class SysAppServiceImpl implements ISysAppService {
}
public
void
createBatch
(
List
<
SysApp
>
list
){
}
@Override
...
...
@@ -55,7 +54,6 @@ public class SysAppServiceImpl implements ISysAppService {
}
public
void
updateBatch
(
List
<
SysApp
>
list
){
}
@Override
...
...
@@ -64,7 +62,6 @@ public class SysAppServiceImpl implements ISysAppService {
}
public
void
removeBatch
(
Collection
<
String
>
idList
){
}
@Override
...
...
@@ -92,7 +89,6 @@ public class SysAppServiceImpl implements ISysAppService {
@Override
public
void
saveBatch
(
List
<
SysApp
>
list
)
{
}
...
...
ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
浏览文件 @
07458e3e
...
...
@@ -23,7 +23,7 @@ import java.util.Map;
* 实体属性默认值切面,只有新建(Create)时才会填充默认值
*/
@Aspect
@Order
(
0
)
@Order
(
5
0
)
@Component
public
class
DEFieldDefaultValueAspect
{
...
...
ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java
浏览文件 @
07458e3e
package
cn
.
ibizlab
.
util
.
aspect
;
import
lombok.SneakyThrows
;
import
lombok.extern.slf4j.Slf4j
;
import
cn.ibizlab.util.annotation.VersionCheck
;
import
cn.ibizlab.util.domain.EntityBase
;
import
cn.ibizlab.util.errors.BadRequestAlertException
;
...
...
@@ -24,7 +23,7 @@ import java.lang.reflect.Field;
* 数据库版本检查
*/
@Aspect
@Order
(
0
)
@Order
(
5
0
)
@Component
public
class
VersionCheckAspect
{
...
...
@@ -33,22 +32,40 @@ public class VersionCheckAspect
@SneakyThrows
@Before
(
"execution(* cn.ibizlab.*.rest.*.update(..)) && @annotation(versionCheck)"
)
public
void
BeforeUpdate
(
JoinPoint
point
,
VersionCheck
versionCheck
){
EvaluationContext
context
=
new
StandardEvaluationContext
();
Object
[]
args
=
point
.
getArgs
();
Object
id
=
args
[
0
];
Object
dto
=
args
[
1
];
if
(
ObjectUtils
.
isEmpty
(
id
)
||
ObjectUtils
.
isEmpty
(
dto
))
return
;
String
versionField
=
versionCheck
.
versionfield
();
if
(
StringUtils
.
isEmpty
(
versionCheck
))
if
(
StringUtils
.
isEmpty
(
versionField
))
return
;
versionCheck
(
versionCheck
,
point
.
getTarget
(),
dto
,
id
);
}
@SneakyThrows
@Before
(
"execution(* cn.ibizlab.*.rest.*.updateBy*(..)) && @annotation(versionCheck)"
)
public
void
BeforeUpdateBy
(
JoinPoint
point
,
VersionCheck
versionCheck
){
Object
[]
args
=
point
.
getArgs
();
Object
id
=
args
[
1
];
Object
dto
=
args
[
2
];
if
(
ObjectUtils
.
isEmpty
(
id
)
||
ObjectUtils
.
isEmpty
(
dto
))
return
;
String
versionField
=
versionCheck
.
versionfield
();
if
(
StringUtils
.
isEmpty
(
versionField
))
return
;
versionCheck
(
versionCheck
,
point
.
getTarget
(),
dto
,
id
);
}
private
void
versionCheck
(
VersionCheck
versionCheck
,
Object
resource
,
Object
dto
,
Object
id
){
EvaluationContext
context
=
new
StandardEvaluationContext
();
context
.
setVariable
(
"dto"
,
dto
);
Expression
newExp
=
parser
.
parseExpression
(
String
.
format
(
"#dto.%s"
,
version
Field
));
Expression
newExp
=
parser
.
parseExpression
(
String
.
format
(
"#dto.%s"
,
version
Check
.
versionfield
()
));
Object
newVersion
=
newExp
.
getValue
(
context
);
if
(
ObjectUtils
.
isEmpty
(
newVersion
))
return
;
//进行版本检查
Object
oldVersion
=
getDBVersion
(
versionCheck
,
getService
(
point
.
getTarget
()
,
versionCheck
.
entity
()),
id
);
Object
oldVersion
=
getDBVersion
(
versionCheck
,
getService
(
resource
,
versionCheck
.
entity
()),
id
);
if
(!
ObjectUtils
.
isEmpty
(
oldVersion
)){
if
(
RuleUtils
.
gt
(
newVersion
,
oldVersion
))
throw
new
BadRequestAlertException
(
"数据已变更,可能后台数据已被修改,请重新加载数据"
,
"VersionCheckAspect"
,
"versionCheck"
);
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录