Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
419c2add
提交
419c2add
编写于
6月 24, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
32177ebf
变更
12
展开全部
显示空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
827 行增加
和
218 行删除
+827
-218
dict-options.ts
app_Web/src/mock/entity/dict-options/dict-options.ts
+271
-0
dict-option-grid-edit-view-base.vue
...option-grid-edit-view/dict-option-grid-edit-view-base.vue
+12
-2
dict-option-grid-view-base.vue
...dict/dict-option-grid-view/dict-option-grid-view-base.vue
+12
-2
router.ts
app_Web/src/pages/rt/index/router.ts
+87
-0
dict-catalog-service-base.ts
...Web/src/service/dict-catalog/dict-catalog-service-base.ts
+50
-0
dict-option-service-base.ts
app_Web/src/service/dict-option/dict-option-service-base.ts
+50
-0
ibzemployee-service-base.ts
app_Web/src/service/ibzemployee/ibzemployee-service-base.ts
+210
-210
main-form-base.vue
...Web/src/widgets/dict-catalog/main-form/main-form-base.vue
+1
-0
DictOptionResource.java
...src/main/java/cn/ibizlab/api/rest/DictOptionResource.java
+121
-0
IBZWFFallback.java
...l/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java
+6
-1
IBZWFFeignClient.java
...rc/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
+4
-1
PermissionSyncJob.java
.../src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+3
-2
未找到文件。
app_Web/src/mock/entity/dict-options/dict-options.ts
浏览文件 @
419c2add
此差异已折叠。
点击以展开。
app_Web/src/pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view-base.vue
浏览文件 @
419c2add
...
...
@@ -1126,7 +1126,12 @@ export default class DictOptionGridEditViewBase extends Vue {
if
(
args
.
length
>
0
){
Object
.
assign
(
tempContext
,
args
[
0
]);
}
const
deResParameters
:
any
[]
=
[];
let
deResParameters
:
any
[]
=
[];
if
(
tempContext
.
dictcatalog
&&
true
){
deResParameters
=
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
]
}
const
parameters
:
any
[]
=
[
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
];
...
...
@@ -1172,7 +1177,12 @@ export default class DictOptionGridEditViewBase extends Vue {
if
(
args
.
length
>
0
){
Object
.
assign
(
tempContext
,
args
[
0
]);
}
const
deResParameters
:
any
[]
=
[];
let
deResParameters
:
any
[]
=
[];
if
(
tempContext
.
dictcatalog
&&
true
){
deResParameters
=
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
]
}
const
parameters
:
any
[]
=
[
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
];
...
...
app_Web/src/pages/dict/dict-option-grid-view/dict-option-grid-view-base.vue
浏览文件 @
419c2add
...
...
@@ -1126,7 +1126,12 @@ export default class DictOptionGridViewBase extends Vue {
if
(
args
.
length
>
0
){
Object
.
assign
(
tempContext
,
args
[
0
]);
}
const
deResParameters
:
any
[]
=
[];
let
deResParameters
:
any
[]
=
[];
if
(
tempContext
.
dictcatalog
&&
true
){
deResParameters
=
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
]
}
const
parameters
:
any
[]
=
[
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
];
...
...
@@ -1172,7 +1177,12 @@ export default class DictOptionGridViewBase extends Vue {
if
(
args
.
length
>
0
){
Object
.
assign
(
tempContext
,
args
[
0
]);
}
const
deResParameters
:
any
[]
=
[];
let
deResParameters
:
any
[]
=
[];
if
(
tempContext
.
dictcatalog
&&
true
){
deResParameters
=
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
]
}
const
parameters
:
any
[]
=
[
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
];
...
...
app_Web/src/pages/rt/index/router.ts
浏览文件 @
419c2add
...
...
@@ -1328,6 +1328,21 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'
),
},
{
path
:
'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?'
,
meta
:
{
caption
:
'entities.dictoption.views.editview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'
),
},
{
path
:
'dictoptions/:dictoption?/editview/:editview?'
,
meta
:
{
...
...
@@ -1631,6 +1646,21 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/uaa/sys-role-permission-custom-view/sys-role-permission-custom-view.vue'
),
},
{
path
:
'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?'
,
meta
:
{
caption
:
'entities.dictoption.views.grideditview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'grideditview'
,
parameterName
:
'grideditview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'
),
},
{
path
:
'dictoptions/:dictoption?/grideditview/:grideditview?'
,
meta
:
{
...
...
@@ -1796,6 +1826,21 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'
),
},
{
path
:
'dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.dictoption.views.gridview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'
),
},
{
path
:
'dictoptions/:dictoption?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -1841,6 +1886,20 @@ const router = new Router({
...
indexRoutes
,
],
},
{
path
:
'/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/editview/:editview?'
,
meta
:
{
caption
:
'entities.dictoption.views.editview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-edit-view/dict-option-edit-view.vue'
),
},
{
path
:
'/dictoptions/:dictoption?/editview/:editview?'
,
meta
:
{
...
...
@@ -2017,6 +2076,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/uaa/sys-user-mpickup-view/sys-user-mpickup-view.vue'
),
},
{
path
:
'/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/gridview/:gridview?'
,
meta
:
{
caption
:
'entities.dictoption.views.gridview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-grid-view/dict-option-grid-view.vue'
),
},
{
path
:
'/dictoptions/:dictoption?/gridview/:gridview?'
,
meta
:
{
...
...
@@ -2264,6 +2337,20 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'
),
},
{
path
:
'/dictcatalogs/:dictcatalog?/dictoptions/:dictoption?/grideditview/:grideditview?'
,
meta
:
{
caption
:
'entities.dictoption.views.grideditview.title'
,
info
:
''
,
parameters
:
[
{
pathName
:
'dictcatalogs'
,
parameterName
:
'dictcatalog'
},
{
pathName
:
'dictoptions'
,
parameterName
:
'dictoption'
},
{
pathName
:
'grideditview'
,
parameterName
:
'grideditview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view.vue'
),
},
{
path
:
'/dictoptions/:dictoption?/grideditview/:grideditview?'
,
meta
:
{
...
...
app_Web/src/service/dict-catalog/dict-catalog-service-base.ts
浏览文件 @
419c2add
...
...
@@ -63,6 +63,7 @@ export default class DictCatalogServiceBase extends EntityService {
public
async
GetDraft
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictcatalogs/getdraft`
,
isloading
);
res
.
data
.
dictcatalog
=
data
.
dictcatalog
;
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_dictoptions'
,
JSON
.
stringify
(
res
.
data
.
dictoptions
));
return
res
;
}
...
...
@@ -77,8 +78,24 @@ export default class DictCatalogServiceBase extends EntityService {
*/
public
async
Update
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
masterData
:
any
=
{};
let
dictoptionsData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
),
'undefined'
)){
dictoptionsData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
)
as
any
);
if
(
dictoptionsData
&&
dictoptionsData
.
length
&&
dictoptionsData
.
length
>
0
){
dictoptionsData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
value_key
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
dictoptions
=
dictoptionsData
;
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/dictcatalogs/
${
context
.
dictcatalog
}
`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_dictoptions'
,
JSON
.
stringify
(
res
.
data
.
dictoptions
));
return
res
;
}
...
...
@@ -93,6 +110,21 @@ export default class DictCatalogServiceBase extends EntityService {
*/
public
async
Create
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
masterData
:
any
=
{};
let
dictoptionsData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
),
'undefined'
)){
dictoptionsData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
)
as
any
);
if
(
dictoptionsData
&&
dictoptionsData
.
length
&&
dictoptionsData
.
length
>
0
){
dictoptionsData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
value_key
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
dictoptions
=
dictoptionsData
;
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
...
...
@@ -102,6 +134,7 @@ export default class DictCatalogServiceBase extends EntityService {
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictcatalogs`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
tempContext
.
srfsessionkey
+
'_dictoptions'
,
JSON
.
stringify
(
res
.
data
.
dictoptions
));
return
res
;
}
...
...
@@ -129,6 +162,7 @@ export default class DictCatalogServiceBase extends EntityService {
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictcatalogs/
${
context
.
dictcatalog
}
`
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_dictoptions'
,
JSON
.
stringify
(
res
.
data
.
dictoptions
));
return
res
;
}
...
...
@@ -143,8 +177,24 @@ export default class DictCatalogServiceBase extends EntityService {
*/
public
async
Save
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
let
masterData
:
any
=
{};
let
dictoptionsData
:
any
=
[];
if
(
!
Object
.
is
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
),
'undefined'
)){
dictoptionsData
=
JSON
.
parse
(
this
.
tempStorage
.
getItem
(
context
.
srfsessionkey
+
'_dictoptions'
)
as
any
);
if
(
dictoptionsData
&&
dictoptionsData
.
length
&&
dictoptionsData
.
length
>
0
){
dictoptionsData
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
srffrontuf
){
if
(
Object
.
is
(
item
.
srffrontuf
,
"0"
)){
item
.
value_key
=
null
;
}
delete
item
.
srffrontuf
;
}
});
}
}
masterData
.
dictoptions
=
dictoptionsData
;
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/save`
,
data
,
isloading
);
this
.
tempStorage
.
setItem
(
context
.
srfsessionkey
+
'_dictoptions'
,
JSON
.
stringify
(
res
.
data
.
dictoptions
));
return
res
;
}
...
...
app_Web/src/service/dict-option/dict-option-service-base.ts
浏览文件 @
419c2add
...
...
@@ -48,6 +48,9 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Select
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
return
Http
.
getInstance
().
get
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
/select`
,
isloading
);
}
return
Http
.
getInstance
().
get
(
`/dictoptions/
${
context
.
dictoption
}
/select`
,
isloading
);
}
...
...
@@ -61,6 +64,12 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
CheckKey
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
/checkkey`
,
data
,
isloading
);
return
res
;
}
return
Http
.
getInstance
().
post
(
`/dictoptions/
${
context
.
dictoption
}
/checkkey`
,
data
,
isloading
);
}
...
...
@@ -74,6 +83,11 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
GetDraft
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
true
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/getdraft`
,
isloading
);
res
.
data
.
dictoption
=
data
.
dictoption
;
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictoptions/getdraft`
,
isloading
);
res
.
data
.
dictoption
=
data
.
dictoption
;
return
res
;
...
...
@@ -89,6 +103,10 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Get
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
`
,
isloading
);
return
res
;
}
let
res
:
any
=
await
Http
.
getInstance
().
get
(
`/dictoptions/
${
context
.
dictoption
}
`
,
isloading
);
return
res
;
}
...
...
@@ -103,6 +121,12 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Update
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
put
(
`/dictoptions/
${
context
.
dictoption
}
`
,
data
,
isloading
);
...
...
@@ -119,6 +143,19 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Create
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
true
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
data
[
this
.
APPDEKEY
]
=
null
;
}
if
(
data
.
srffrontuf
){
delete
data
.
srffrontuf
;
}
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
));
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
if
(
!
data
.
srffrontuf
||
data
.
srffrontuf
!==
"1"
){
...
...
@@ -142,6 +179,12 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Save
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
/save`
,
data
,
isloading
);
return
res
;
}
let
masterData
:
any
=
{};
Object
.
assign
(
data
,
masterData
);
let
res
:
any
=
await
Http
.
getInstance
().
post
(
`/dictoptions/
${
context
.
dictoption
}
/save`
,
data
,
isloading
);
...
...
@@ -158,6 +201,9 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
Remove
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
context
.
dictoption
){
return
Http
.
getInstance
().
delete
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/
${
context
.
dictoption
}
`
,
isloading
);
}
return
Http
.
getInstance
().
delete
(
`/dictoptions/
${
context
.
dictoption
}
`
,
isloading
);
}
...
...
@@ -171,6 +217,10 @@ export default class DictOptionServiceBase extends EntityService {
* @memberof DictOptionServiceBase
*/
public
async
FetchDefault
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
if
(
context
.
dictcatalog
&&
true
){
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/dictcatalogs/
${
context
.
dictcatalog
}
/dictoptions/fetchdefault`
,
tempData
,
isloading
);
}
let
tempData
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
return
Http
.
getInstance
().
get
(
`/dictoptions/fetchdefault`
,
tempData
,
isloading
);
}
...
...
app_Web/src/service/ibzemployee/ibzemployee-service-base.ts
浏览文件 @
419c2add
此差异已折叠。
点击以展开。
app_Web/src/widgets/dict-catalog/main-form/main-form-base.vue
浏览文件 @
419c2add
...
...
@@ -43,6 +43,7 @@
paramItem=
'dictcatalog'
:parentdata=
'
{"srfparentdefname":"CID","srfparentdename":"DICT_CATALOG","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_DICT_OPTION_DICT_CATALOG_CID","SRFDER1NID":"DER1N_DICT_OPTION_DICT_CATALOG_CID"}'
:parameters="[
{ pathName: 'dictcatalogs', parameterName: 'dictcatalog' },
]"
:context="context"
:viewparams="viewparams"
...
...
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/DictOptionResource.java
浏览文件 @
419c2add
...
...
@@ -147,5 +147,126 @@ public class DictOptionResource {
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
dictoptionMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
@ApiOperation
(
value
=
"根据字典检查字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典检查字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/checkkey"
)
public
ResponseEntity
<
Boolean
>
checkKeyByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionService
.
checkKey
(
dictoptionMapping
.
toDomain
(
dictoptiondto
)));
}
@ApiOperation
(
value
=
"根据字典获取字典项草稿"
,
tags
=
{
"字典项"
},
notes
=
"根据字典获取字典项草稿"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/getdraft"
)
public
ResponseEntity
<
DictOptionDTO
>
getDraftByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
)
{
DictOption
domain
=
new
DictOption
();
domain
.
setCatalogId
(
dictcatalog_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionMapping
.
toDto
(
dictoptionService
.
getDraft
(
domain
)));
}
@ApiOperation
(
value
=
"根据字典获取字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典获取字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}"
)
public
ResponseEntity
<
DictOptionDTO
>
getByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@PathVariable
(
"dictoption_id"
)
String
dictoption_id
)
{
DictOption
domain
=
dictoptionService
.
get
(
dictoption_id
);
DictOptionDTO
dto
=
dictoptionMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@ApiOperation
(
value
=
"根据字典更新字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典更新字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}"
)
public
ResponseEntity
<
DictOptionDTO
>
updateByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@PathVariable
(
"dictoption_id"
)
String
dictoption_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
domain
.
setCatalogId
(
dictcatalog_id
);
domain
.
setValueKey
(
dictoption_id
);
dictoptionService
.
update
(
domain
);
DictOptionDTO
dto
=
dictoptionMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@ApiOperation
(
value
=
"根据字典批量更新字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典批量更新字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
PUT
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/batch"
)
public
ResponseEntity
<
Boolean
>
updateBatchByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
List
<
DictOptionDTO
>
dictoptiondtos
)
{
List
<
DictOption
>
domainlist
=
dictoptionMapping
.
toDomain
(
dictoptiondtos
);
for
(
DictOption
domain:
domainlist
){
domain
.
setCatalogId
(
dictcatalog_id
);
}
dictoptionService
.
updateBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"根据字典建立字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典建立字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions"
)
public
ResponseEntity
<
DictOptionDTO
>
createByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
domain
.
setCatalogId
(
dictcatalog_id
);
dictoptionService
.
create
(
domain
);
DictOptionDTO
dto
=
dictoptionMapping
.
toDto
(
domain
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dto
);
}
@ApiOperation
(
value
=
"根据字典批量建立字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典批量建立字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/batch"
)
public
ResponseEntity
<
Boolean
>
createBatchByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
List
<
DictOptionDTO
>
dictoptiondtos
)
{
List
<
DictOption
>
domainlist
=
dictoptionMapping
.
toDomain
(
dictoptiondtos
);
for
(
DictOption
domain:
domainlist
){
domain
.
setCatalogId
(
dictcatalog_id
);
}
dictoptionService
.
createBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"根据字典保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典保存字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/save"
)
public
ResponseEntity
<
Boolean
>
saveByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionDTO
dictoptiondto
)
{
DictOption
domain
=
dictoptionMapping
.
toDomain
(
dictoptiondto
);
domain
.
setCatalogId
(
dictcatalog_id
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionService
.
save
(
domain
));
}
@ApiOperation
(
value
=
"根据字典批量保存字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典批量保存字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/savebatch"
)
public
ResponseEntity
<
Boolean
>
saveBatchByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
List
<
DictOptionDTO
>
dictoptiondtos
)
{
List
<
DictOption
>
domainlist
=
dictoptionMapping
.
toDomain
(
dictoptiondtos
);
for
(
DictOption
domain:
domainlist
){
domain
.
setCatalogId
(
dictcatalog_id
);
}
dictoptionService
.
saveBatch
(
domainlist
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"根据字典删除字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典删除字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/{dictoption_id}"
)
public
ResponseEntity
<
Boolean
>
removeByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@PathVariable
(
"dictoption_id"
)
String
dictoption_id
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
dictoptionService
.
remove
(
dictoption_id
));
}
@ApiOperation
(
value
=
"根据字典批量删除字典项"
,
tags
=
{
"字典项"
},
notes
=
"根据字典批量删除字典项"
)
@RequestMapping
(
method
=
RequestMethod
.
DELETE
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/batch"
)
public
ResponseEntity
<
Boolean
>
removeBatchByDictCatalog
(
@RequestBody
List
<
String
>
ids
)
{
dictoptionService
.
removeBatch
(
ids
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
true
);
}
@ApiOperation
(
value
=
"根据字典获取DEFAULT"
,
tags
=
{
"字典项"
}
,
notes
=
"根据字典获取DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/fetchdefault"
)
public
ResponseEntity
<
List
<
DictOptionDTO
>>
fetchDictOptionDefaultByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
DictOptionSearchContext
context
)
{
context
.
setN_cid_eq
(
dictcatalog_id
);
Page
<
DictOption
>
domains
=
dictoptionService
.
searchDefault
(
context
)
;
List
<
DictOptionDTO
>
list
=
dictoptionMapping
.
toDto
(
domains
.
getContent
());
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
header
(
"x-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageNumber
()))
.
header
(
"x-per-page"
,
String
.
valueOf
(
context
.
getPageable
().
getPageSize
()))
.
header
(
"x-total"
,
String
.
valueOf
(
domains
.
getTotalElements
()))
.
body
(
list
);
}
@ApiOperation
(
value
=
"根据字典查询DEFAULT"
,
tags
=
{
"字典项"
}
,
notes
=
"根据字典查询DEFAULT"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/dictcatalogs/{dictcatalog_id}/dictoptions/searchdefault"
)
public
ResponseEntity
<
Page
<
DictOptionDTO
>>
searchDictOptionDefaultByDictCatalog
(
@PathVariable
(
"dictcatalog_id"
)
String
dictcatalog_id
,
@RequestBody
DictOptionSearchContext
context
)
{
context
.
setN_cid_eq
(
dictcatalog_id
);
Page
<
DictOption
>
domains
=
dictoptionService
.
searchDefault
(
context
)
;
return
ResponseEntity
.
status
(
HttpStatus
.
OK
)
.
body
(
new
PageImpl
(
dictoptionMapping
.
toDto
(
domains
.
getContent
()),
context
.
getPageable
(),
domains
.
getTotalElements
()));
}
}
ibzrt-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java
浏览文件 @
419c2add
package
cn
.
ibizlab
.
util
.
client
;
import
org.springframework.stereotype.Component
;
import
java.util.
List
;
import
java.util.
*
;
@Component
public
class
IBZWFFallback
implements
IBZWFFeignClient
{
...
...
@@ -15,4 +15,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
public
List
<
String
>
getbusinesskeysByUserId
(
String
system
,
String
userId
,
String
entity
,
String
processDefinitionKey
,
String
taskDefinitionKey
)
{
return
null
;
}
@Override
public
Boolean
deployBpmnFile
(
List
<
Map
<
String
,
Object
>>
bpmnfiles
)
{
return
null
;
}
}
ibzrt-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
浏览文件 @
419c2add
...
...
@@ -2,7 +2,7 @@ package cn.ibizlab.util.client;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.
List
;
import
java.util.
*
;
@FeignClient
(
value
=
"ibzwf-api"
,
fallback
=
IBZWFFallback
.
class
)
public
interface
IBZWFFeignClient
...
...
@@ -15,4 +15,7 @@ public interface IBZWFFeignClient
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks"
)
List
<
String
>
getbusinesskeysByUserId
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"userId"
)
String
userId
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"processDefinitionKey"
)
String
processDefinitionKey
,
@PathVariable
(
"taskDefinitionKey"
)
String
taskDefinitionKey
);
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/deploybpmn"
)
Boolean
deployBpmnFile
(
@RequestBody
List
<
Map
<
String
,
Object
>>
bpmnfiles
);
}
ibzrt-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @
419c2add
...
...
@@ -12,6 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import
org.springframework.context.annotation.Lazy
;
import
org.springframework.stereotype.Component
;
import
java.io.InputStream
;
import
java.util.*
;
/**
* 权限:向uaa同步当前系统菜单、权限资源任务类
...
...
@@ -21,15 +22,14 @@ import java.io.InputStream;
@ConditionalOnProperty
(
name
=
"ibiz.enablePermissionValid"
,
havingValue
=
"true"
)
public
class
PermissionSyncJob
implements
ApplicationRunner
{
@Autowired
@Lazy
private
IBZUAAFeignClient
client
;
@Value
(
"${ibiz.systemid:ibzrt}"
)
private
String
systemId
;
@Override
public
void
run
(
ApplicationArguments
args
)
{
try
{
...
...
@@ -49,5 +49,6 @@ public class PermissionSyncJob implements ApplicationRunner {
catch
(
Exception
ex
)
{
log
.
error
(
String
.
format
(
"向[UAA]同步系统资源失败,请检查[UAA]服务是否正常! [%s]"
,
ex
));
}
}
}
\ No newline at end of file
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录