提交 86d70e41 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 部署微服务应用

上级 6607f9fc
## v7.0.0-alpha.7 [2020-5-28]
### Bug修复
修复门户部件flex布局
修复表格选择框列样式出现省略号
修复批删除传递参数调整
修复表单上界面行为参数传递bug
修复分页导航、编辑类视图标题
修复界面行为多主键分隔符由";"改为","
修复导航类视图宽度格式
修复图表排序
修复关系界面逻辑
修复401跳登录页清除user和token
### 功能新增及优化
#### 模板
列表,数据视图默认排序
面板项支持偏移
应用支持自定义默认端口
门户部件图标和容器样式
表格列头图片和头部样式
表格操作列图标
表格编辑项值规则
增加树选择双击事件
增加图表分组属性计数统计(srfcount)
增加雷达图支持
#### 基础文件
修复分页导航、编辑类视图标题
修复界面行为多主键分隔符由";"改为","
修复关系界面逻辑
修复401跳登录页清除user和token
## v7.0.0-alpha.6 [2020-5-23] ## v7.0.0-alpha.6 [2020-5-23]
### Bug修复 ### Bug修复
......
.context-menu-container { .context-menu-container {
// width: 100vw; // width: 100vw;
// height: 100vh; // height: 100vh;
// z-index: -10000; // z-index: -10000;
// position: absolute; // position: absolute;
// top: 0; // top: 0;
// left: 0; // left: 0;
line-height: 1; // line-height: 1;
z-index: 10001;
.context-menu-content { .context-menu-content {
z-index: 10001; position: absolute;
position: absolute; background: #FFF;
background: #FFF; // border: 1px solid #e3e3e3;
// border: 1px solid #e3e3e3; .ivu-divider{
} width: 100%;
}
.context-menus { }
.context-menus-item { .context-menus {
list-style: none;
line-height: 36px; .context-menus-item {
padding: 0 13px; list-style: none;
margin: 0; line-height: 36px;
font-size: 14px; padding: 0 13px;
color: #606266; margin: 0;
cursor: pointer; font-size: 14px;
outline: none; color: #606266;
display: flex; cursor: pointer;
outline: none;
.icon { display: flex;
display: flex;
justify-content: center; .icon {
align-items: center; display: flex;
font-size: 16px; justify-content: center;
width: 20px; align-items: center;
margin-right: 8px; font-size: 16px;
} width: 20px;
} margin-right: 8px;
}
.context-menus-item:hover { }
background-color: #ecf5ff;
color: #66b1ff; .context-menus-item:hover {
} background-color: #ecf5ff;
} color: #66b1ff;
}
}
} }
.context-menu { .context-menu {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
\ No newline at end of file
...@@ -67,8 +67,6 @@ export default { ...@@ -67,8 +67,6 @@ export default {
details: { details: {
formpage1: "Enable DataGrid Inline Row Edit Mode", formpage1: "Enable DataGrid Inline Row Edit Mode",
n_sys_rolename_like: "Save", n_sys_rolename_like: "Save",
n_sys_rolename_isnotnull: "角色表名称(NotNil)",
n_sys_rolename_isnull: "角色表名称(Nil)",
}, },
uiactions: { uiactions: {
}, },
......
export default { export default {
fields: { fields: {
roleid: '角色标识', roleid: '角色标识',
rolename: '角色名称', rolename: '角色名称',
memo: '备注', memo: '备注',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
...@@ -39,23 +39,23 @@ export default { ...@@ -39,23 +39,23 @@ export default {
formpage1: '基本信息', formpage1: '基本信息',
srfupdatedate: '更新时间', srfupdatedate: '更新时间',
srforikey: '', srforikey: '',
srfkey: '角色标识', srfkey: '角色标识',
srfmajortext: '角色名称', srfmajortext: '角色名称',
srftempmode: '', srftempmode: '',
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
sys_rolename: '角色名称', sys_rolename: '角色名称',
memo: '备注', memo: '备注',
sys_roleid: '角色标识', sys_roleid: '角色标识',
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { main_grid: {
columns: { columns: {
sys_roleid: '角色标识', sys_roleid: '角色标识',
sys_rolename: '角色名称', sys_rolename: '角色名称',
memo: '备注', memo: '备注',
updatedate: '更新时间', updatedate: '更新时间',
}, },
...@@ -65,9 +65,7 @@ export default { ...@@ -65,9 +65,7 @@ export default {
default_searchform: { default_searchform: {
details: { details: {
formpage1: '常规条件', formpage1: '常规条件',
n_sys_rolename_like: '角色表名称(%)', n_sys_rolename_like: '角色名称(%)',
n_sys_rolename_isnotnull: '角色表名称(NotNil)',
n_sys_rolename_isnull: '角色表名称(Nil)',
}, },
uiactions: { uiactions: {
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
export default { export default {
fields: { fields: {
userroleid: 'The major data entity cannot be found', userroleid: 'The major data entity cannot be found',
roleid: '角色标识', roleid: '角色标识',
rolename: '角色名称', rolename: '角色名称',
userid: '用户标识', userid: '用户标识',
personname: '用户名称', personname: '用户名称',
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
sys_roleid: "角色标识", sys_roleid: "角色标识",
sys_user_roleid: "The major data entity cannot be found", sys_user_roleid: "The major data entity cannot be found",
sys_rolename: "角色名称", sys_rolename: "角色名称",
sys_username: "用户名称", sys_username: "用户名称",
......
export default { export default {
fields: { fields: {
userroleid: '用户角色关系标识', userroleid: '用户角色关系标识',
roleid: '角色标识', roleid: '角色标识',
rolename: '角色名称', rolename: '角色名称',
userid: '用户标识', userid: '用户标识',
personname: '用户名称', personname: '用户名称',
...@@ -24,14 +24,14 @@ export default { ...@@ -24,14 +24,14 @@ export default {
formpage1: '基本信息', formpage1: '基本信息',
srfupdatedate: '更新时间', srfupdatedate: '更新时间',
srforikey: '', srforikey: '',
srfkey: '用户角色关系标识', srfkey: '用户角色关系标识',
srfmajortext: '用户标识', srfmajortext: '用户标识',
srftempmode: '', srftempmode: '',
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
sys_roleid: '角色标识', sys_roleid: '角色标识',
sys_user_roleid: '用户角色关系标识', sys_user_roleid: '用户角色关系标识',
sys_rolename: '角色名称', sys_rolename: '角色名称',
sys_username: '用户名称', sys_username: '用户名称',
sys_userid: '用户标识', sys_userid: '用户标识',
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class='view-top-messages'> <div class='view-top-messages'>
</div> </div>
<div style='margin-bottom: 6px;'> <div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色名称" /> <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="角色名称" />
<div class='pull-right'> <div class='pull-right'>
<div class='toolbar-container'> <div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
......
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
} }
} }
.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview{ .view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
>.view-card.view-no-caption{ >.view-card.view-no-caption{
>.ivu-card-body{ >.ivu-card-body{
height: 100%; height: 100%;
......
...@@ -29,5 +29,8 @@ ...@@ -29,5 +29,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
.icon{
padding-right: 10px;
}
} }
// this is less // this is less
...@@ -29,5 +29,8 @@ ...@@ -29,5 +29,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
.icon{
padding-right: 10px;
}
} }
// this is less // this is less
...@@ -9,18 +9,6 @@ ...@@ -9,18 +9,6 @@
<input-box v-model="data.n_sys_rolename_like" @enter="onEnter($event)" :disabled="detailsModel.n_sys_rolename_like.disabled" type='text' style=""></input-box> <input-box v-model="data.n_sys_rolename_like" @enter="onEnter($event)" :disabled="detailsModel.n_sys_rolename_like.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.n_sys_rolename_isnotnull.visible" :style="{}" :lg="{ span: 8, offset: 0 }">
<app-form-item name='n_sys_rolename_isnotnull' :itemRules="this.rules.n_sys_rolename_isnotnull" class='' :caption="$t('entities.sysrole.default_searchform.details.n_sys_rolename_isnotnull')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_rolename_isnotnull.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_sys_rolename_isnotnull" @enter="onEnter($event)" :disabled="detailsModel.n_sys_rolename_isnotnull.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_sys_rolename_isnull.visible" :style="{}" :lg="{ span: 8, offset: 0 }">
<app-form-item name='n_sys_rolename_isnull' :itemRules="this.rules.n_sys_rolename_isnull" class='' :caption="$t('entities.sysrole.default_searchform.details.n_sys_rolename_isnull')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_rolename_isnull.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_sys_rolename_isnull" @enter="onEnter($event)" :disabled="detailsModel.n_sys_rolename_isnull.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col> </i-col>
</row> </row>
</i-col> </i-col>
...@@ -263,8 +251,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -263,8 +251,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public data: any = { public data: any = {
n_sys_rolename_like: null, n_sys_rolename_like: null,
n_sys_rolename_isnotnull: null,
n_sys_rolename_isnull: null,
}; };
/** /**
...@@ -275,22 +261,10 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -275,22 +261,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public rules: any = { public rules: any = {
n_sys_rolename_like: [ n_sys_rolename_like: [
{ type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称(%) 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表名称(%) 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'blur' },
],
n_sys_rolename_isnotnull: [
{ type: 'string', message: '角色表名称(NotNil) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称(NotNil) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称(NotNil) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表名称(NotNil) 值不能为空', trigger: 'blur' },
],
n_sys_rolename_isnull: [
{ type: 'string', message: '角色表名称(Nil) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称(Nil) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称(Nil) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表名称(Nil) 值不能为空', trigger: 'blur' },
], ],
} }
...@@ -303,11 +277,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -303,11 +277,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
public detailsModel: any = { public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this }) formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
, ,
n_sys_rolename_like: new FormItemModel({ caption: '角色表名称(%)', detailType: 'FORMITEM', name: 'n_sys_rolename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) n_sys_rolename_like: new FormItemModel({ caption: '角色名称(%)', detailType: 'FORMITEM', name: 'n_sys_rolename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_sys_rolename_isnotnull: new FormItemModel({ caption: '角色表名称(NotNil)', detailType: 'FORMITEM', name: 'n_sys_rolename_isnotnull', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_sys_rolename_isnull: new FormItemModel({ caption: '角色表名称(Nil)', detailType: 'FORMITEM', name: 'n_sys_rolename_isnull', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
...@@ -323,30 +293,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -323,30 +293,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_sys_rolename_like', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'n_sys_rolename_like', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 n_sys_rolename_isnotnull 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_sys_rolename_isnotnull')
onN_sys_rolename_isnotnullChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_sys_rolename_isnotnull', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_sys_rolename_isnull 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_sys_rolename_isnull')
onN_sys_rolename_isnullChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_sys_rolename_isnull', newVal: newVal, oldVal: oldVal });
}
/** /**
* 重置表单项值 * 重置表单项值
...@@ -369,8 +315,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -369,8 +315,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
......
...@@ -30,16 +30,6 @@ export default class DefaultModel { ...@@ -30,16 +30,6 @@ export default class DefaultModel {
prop: 'rolename', prop: 'rolename',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'n_sys_rolename_isnotnull',
prop: 'rolename',
dataType: 'TEXT',
},
{
name: 'n_sys_rolename_isnull',
prop: 'rolename',
dataType: 'TEXT',
},
] ]
} }
......
...@@ -464,16 +464,16 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -464,16 +464,16 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
srfkey: [ srfkey: [
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
], ],
srfmajortext: [ srfmajortext: [
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
], ],
srftempmode: [ srftempmode: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
...@@ -500,10 +500,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -500,10 +500,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
sys_rolename: [ sys_rolename: [
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
], ],
memo: [ memo: [
{ type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' },
...@@ -512,10 +512,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -512,10 +512,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
], ],
sys_roleid: [ sys_roleid: [
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
], ],
} }
...@@ -544,9 +544,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -544,9 +544,9 @@ export default class MainBase extends Vue implements ControlInterface {
, ,
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfkey: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfkey: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfmajortext: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfmajortext: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -556,11 +556,11 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -556,11 +556,11 @@ export default class MainBase extends Vue implements ControlInterface {
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
......
...@@ -536,14 +536,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -536,14 +536,14 @@ export default class MainBase extends Vue implements ControlInterface {
public allColumns: any[] = [ public allColumns: any[] = [
{ {
name: 'sys_roleid', name: 'sys_roleid',
label: '角色标识', label: '角色标识',
langtag: 'entities.sysrole.main_grid.columns.sys_roleid', langtag: 'entities.sysrole.main_grid.columns.sys_roleid',
show: true, show: true,
util: 'PX' util: 'PX'
}, },
{ {
name: 'sys_rolename', name: 'sys_rolename',
label: '角色名称', label: '角色名称',
langtag: 'entities.sysrole.main_grid.columns.sys_rolename', langtag: 'entities.sysrole.main_grid.columns.sys_rolename',
show: true, show: true,
util: 'PX' util: 'PX'
...@@ -592,8 +592,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -592,8 +592,8 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public rules: any = { public rules: any = {
srfkey: [ srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'change' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'blur' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'blur' },
], ],
} }
......
...@@ -70,16 +70,6 @@ export default class MainModel { ...@@ -70,16 +70,6 @@ export default class MainModel {
prop: 'n_sys_rolename_like', prop: 'n_sys_rolename_like',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'n_sys_rolename_isnotnull',
prop: 'n_sys_rolename_isnotnull',
dataType: 'TEXT',
},
{
name: 'n_sys_rolename_isnull',
prop: 'n_sys_rolename_isnull',
dataType: 'TEXT',
},
{ {
name:'size', name:'size',
......
...@@ -440,10 +440,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -440,10 +440,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
srfkey: [ srfkey: [
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
], ],
srfmajortext: [ srfmajortext: [
{ type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'change' },
...@@ -476,16 +476,16 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -476,16 +476,16 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
], ],
sys_roleid: [ sys_roleid: [
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
], ],
sys_user_roleid: [ sys_user_roleid: [
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
], ],
sys_rolename: [ sys_rolename: [
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
...@@ -522,7 +522,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -522,7 +522,7 @@ export default class MainBase extends Vue implements ControlInterface {
, ,
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfkey: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfkey: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfmajortext: new FormItemModel({ caption: '用户标识', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfmajortext: new FormItemModel({ caption: '用户标识', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -534,9 +534,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -534,9 +534,9 @@ export default class MainBase extends Vue implements ControlInterface {
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_user_roleid: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'sys_user_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_user_roleid: new FormItemModel({ caption: '用户角色关系标识', detailType: 'FORMITEM', name: 'sys_user_roleid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
......
...@@ -587,8 +587,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -587,8 +587,8 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public rules: any = { public rules: any = {
srfkey: [ srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'change' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'blur' }, { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'blur' },
], ],
} }
......
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
git clone -b master $para2 ibzrt/ git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/ cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBZ_SLEEP=0 \ IBIZ_SLEEP=0 \
JAVA_OPTS="" JAVA_OPTS=""
CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
EXPOSE 8080 EXPOSE 30000
ADD ibzrt-app-web.jar /ibzrt-app-web.jar ADD ibzrt-app-web.jar /ibzrt-app-web.jar
...@@ -3,9 +3,21 @@ services: ...@@ -3,9 +3,21 @@ services:
ibzrt-app-web: ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports: ports:
- "8080:8080" - "30000:30000"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
...@@ -101,7 +101,10 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -101,7 +101,10 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
"/**/fonts/**", "/**/fonts/**",
"/**/js/**", "/**/js/**",
"/**/img/**", "/**/img/**",
"/" "/",
"webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll() ).permitAll()
//放行登录请求 //放行登录请求
.antMatchers( HttpMethod.POST,"/"+loginPath).permitAll() .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
......
...@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient; ...@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient;
public class SysRole extends EntityClient implements Serializable { public class SysRole extends EntityClient implements Serializable {
/** /**
* 角色标识 * 角色标识
*/ */
@DEField(name = "sys_roleid" , isKeyField=true) @DEField(name = "sys_roleid" , isKeyField=true)
@JSONField(name = "roleid") @JSONField(name = "roleid")
...@@ -38,7 +38,7 @@ public class SysRole extends EntityClient implements Serializable { ...@@ -38,7 +38,7 @@ public class SysRole extends EntityClient implements Serializable {
private String roleid; private String roleid;
/** /**
* 角色名称 * 角色名称
*/ */
@DEField(name = "sys_rolename") @DEField(name = "sys_rolename")
@JSONField(name = "rolename") @JSONField(name = "rolename")
...@@ -75,7 +75,7 @@ public class SysRole extends EntityClient implements Serializable { ...@@ -75,7 +75,7 @@ public class SysRole extends EntityClient implements Serializable {
/** /**
* 设置 [角色名称] * 设置 [角色名称]
*/ */
public void setRolename(String rolename){ public void setRolename(String rolename){
this.rolename = rolename ; this.rolename = rolename ;
......
...@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient; ...@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient;
public class SysUserRole extends EntityClient implements Serializable { public class SysUserRole extends EntityClient implements Serializable {
/** /**
* 用户角色关系标识 * 用户角色关系标识
*/ */
@DEField(name = "sys_user_roleid" , isKeyField=true) @DEField(name = "sys_user_roleid" , isKeyField=true)
@JSONField(name = "userroleid") @JSONField(name = "userroleid")
...@@ -38,7 +38,7 @@ public class SysUserRole extends EntityClient implements Serializable { ...@@ -38,7 +38,7 @@ public class SysUserRole extends EntityClient implements Serializable {
private String userroleid; private String userroleid;
/** /**
* 角色标识 * 角色标识
*/ */
@DEField(name = "sys_roleid") @DEField(name = "sys_roleid")
@JSONField(name = "roleid") @JSONField(name = "roleid")
...@@ -104,7 +104,7 @@ public class SysUserRole extends EntityClient implements Serializable { ...@@ -104,7 +104,7 @@ public class SysUserRole extends EntityClient implements Serializable {
/** /**
* 设置 [角色标识] * 设置 [角色标识]
*/ */
public void setRoleid(String roleid){ public void setRoleid(String roleid){
this.roleid = roleid ; this.roleid = roleid ;
......
...@@ -25,11 +25,11 @@ import cn.ibizlab.util.filter.SearchContextBase; ...@@ -25,11 +25,11 @@ import cn.ibizlab.util.filter.SearchContextBase;
@Slf4j @Slf4j
@Data @Data
public class SysRoleSearchContext extends SearchContextBase { public class SysRoleSearchContext extends SearchContextBase {
private String n_sys_rolename_isnotnull;//[角色名称] private String n_sys_rolename_isnotnull;//[角色名称]
private String n_sys_rolename_isnull;//[角色名称] private String n_sys_rolename_isnull;//[角色名称]
private String n_sys_rolename_like;//[角色名称] private String n_sys_rolename_like;//[角色名称]
} }
......
...@@ -25,7 +25,7 @@ import cn.ibizlab.util.filter.SearchContextBase; ...@@ -25,7 +25,7 @@ import cn.ibizlab.util.filter.SearchContextBase;
@Slf4j @Slf4j
@Data @Data
public class SysUserRoleSearchContext extends SearchContextBase { public class SysUserRoleSearchContext extends SearchContextBase {
private String n_sys_roleid_eq;//[角色标识] private String n_sys_roleid_eq;//[角色标识]
private String n_sys_userid_eq;//[用户标识] private String n_sys_userid_eq;//[用户标识]
......
package cn.ibizlab.core.util.config;
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
/**
* xxl-job config
* 分布式任务调度平台XXL-JOB配置加载
* @author xuxueli 2017-04-28
*/
@Configuration
public class XxlJobConfig {
private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
@Value("${xxl.job.admin.addresses:}")
private String adminAddresses;
@Value("${xxl.job.accessToken:}")
private String accessToken;
@Value("${xxl.job.executor.appname:ibzrt}")
private String appName;
@Value("${xxl.job.executor.ip:127.0.0.1}")
private String ip;
@Value("${xxl.job.executor.port:9999}")
private int port;
@Value("${xxl.job.executor.logpath:/app/joblog}")
private String logPath;
@Value("${xxl.job.executor.logretentiondays:-1}")
private int logRetentionDays;
@Bean(initMethod = "start", destroyMethod = "destroy")
public XxlJobSpringExecutor xxlJobExecutor() {
if(!StringUtils.isEmpty(adminAddresses)){
logger.info(">>>>>>>>>>> xxl-job config init.");
logger.info(">>>>>>>>>>> adminAddresses:"+adminAddresses);
logger.info(">>>>>>>>>>> appName:"+appName);
logger.info(">>>>>>>>>>> ip:"+ip);
logger.info(">>>>>>>>>>> port:"+port);
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
xxlJobSpringExecutor.setAppName(appName);
xxlJobSpringExecutor.setIp(ip);
xxlJobSpringExecutor.setPort(port);
xxlJobSpringExecutor.setAccessToken(accessToken);
xxlJobSpringExecutor.setLogPath(logPath);
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
return xxlJobSpringExecutor;
}
logger.info(">>>>>>>>>>> xxl-job config not init.");
return null;
}
/**
* 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP;
*
* 1、引入依赖:
* <dependency>
* <groupId>org.springframework.cloud</groupId>
* <artifactId>spring-cloud-commons</artifactId>
* <version>${version}"</version>
* </dependency>
*
* 2、配置文件,或者容器启动变量
* spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
*
* 3、获取IP
* String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
*/
}
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
<!--httpClient --> <!--httpClient -->
<openfeign-httpclient.version>11.0</openfeign-httpclient.version> <openfeign-httpclient.version>11.0</openfeign-httpclient.version>
<!--xxl-job定时服务 -->
<xxl-job.version>2.1.0</xxl-job.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -249,6 +252,12 @@ ...@@ -249,6 +252,12 @@
<version>${openfeign-httpclient.version}</version> <version>${openfeign-httpclient.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -308,6 +317,12 @@ ...@@ -308,6 +317,12 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<!--xxl-job定时服务 -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
<!-- Error --> <!-- Error -->
<!-- Security --> <!-- Security -->
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBZ_SLEEP=0 \ IBIZ_SLEEP=0 \
JAVA_OPTS="" JAVA_OPTS=""
CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-provider-api.jar
EXPOSE 8081 EXPOSE 8081
......
...@@ -106,7 +106,10 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -106,7 +106,10 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
"/**/fonts/**", "/**/fonts/**",
"/**/js/**", "/**/js/**",
"/**/img/**", "/**/img/**",
"/" "/",
"webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll() ).permitAll()
//放行登录请求 //放行登录请求
.antMatchers( HttpMethod.POST,"/"+loginPath).permitAll() .antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZDepartmentService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZDepartmentService;
import cn.ibizlab.core.ou.filter.IBZDepartmentSearchContext; import cn.ibizlab.core.ou.filter.IBZDepartmentSearchContext;
@Slf4j @Slf4j
@Api(tags = {"IBZDepartment" }) @Api(tags = {"部门" })
@RestController("api-ibzdepartment") @RestController("api-ibzdepartment")
@RequestMapping("") @RequestMapping("")
public class IBZDepartmentResource { public class IBZDepartmentResource {
...@@ -46,20 +46,20 @@ public class IBZDepartmentResource { ...@@ -46,20 +46,20 @@ public class IBZDepartmentResource {
@Lazy @Lazy
public IBZDepartmentMapping ibzdepartmentMapping; public IBZDepartmentMapping ibzdepartmentMapping;
@ApiOperation(value = "Save", tags = {"IBZDepartment" }, notes = "Save") @ApiOperation(value = "保存部门", tags = {"部门" }, notes = "保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/save")
public ResponseEntity<Boolean> save(@RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<Boolean> save(@RequestBody IBZDepartmentDTO ibzdepartmentdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.save(ibzdepartmentMapping.toDomain(ibzdepartmentdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.save(ibzdepartmentMapping.toDomain(ibzdepartmentdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"IBZDepartment" }, notes = "SaveBatch") @ApiOperation(value = "批量保存部门", tags = {"部门" }, notes = "批量保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
ibzdepartmentService.saveBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos)); ibzdepartmentService.saveBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"IBZDepartment" }, notes = "Get") @ApiOperation(value = "获取部门", tags = {"部门" }, notes = "获取部门")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<IBZDepartmentDTO> get(@PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZDepartmentDTO> get(@PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZDepartment domain = ibzdepartmentService.get(ibzdepartment_id); IBZDepartment domain = ibzdepartmentService.get(ibzdepartment_id);
...@@ -67,27 +67,27 @@ public class IBZDepartmentResource { ...@@ -67,27 +67,27 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Remove", tags = {"IBZDepartment" }, notes = "Remove") @ApiOperation(value = "删除部门", tags = {"部门" }, notes = "删除部门")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<Boolean> remove(@PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<Boolean> remove(@PathVariable("ibzdepartment_id") String ibzdepartment_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.remove(ibzdepartment_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.remove(ibzdepartment_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"IBZDepartment" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除部门", tags = {"部门" }, notes = "批量删除部门")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzdepartmentService.removeBatch(ids); ibzdepartmentService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"IBZDepartment" }, notes = "CheckKey") @ApiOperation(value = "检查部门", tags = {"部门" }, notes = "检查部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<Boolean> checkKey(@RequestBody IBZDepartmentDTO ibzdepartmentdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.checkKey(ibzdepartmentMapping.toDomain(ibzdepartmentdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.checkKey(ibzdepartmentMapping.toDomain(ibzdepartmentdto)));
} }
@ApiOperation(value = "Update", tags = {"IBZDepartment" }, notes = "Update") @ApiOperation(value = "更新部门", tags = {"部门" }, notes = "更新部门")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<IBZDepartmentDTO> update(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<IBZDepartmentDTO> update(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
...@@ -98,14 +98,14 @@ public class IBZDepartmentResource { ...@@ -98,14 +98,14 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"IBZDepartment" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新部门", tags = {"部门" }, notes = "批量更新部门")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
ibzdepartmentService.updateBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos)); ibzdepartmentService.updateBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"IBZDepartment" }, notes = "Create") @ApiOperation(value = "新建部门", tags = {"部门" }, notes = "新建部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments")
public ResponseEntity<IBZDepartmentDTO> create(@RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<IBZDepartmentDTO> create(@RequestBody IBZDepartmentDTO ibzdepartmentdto) {
...@@ -115,20 +115,20 @@ public class IBZDepartmentResource { ...@@ -115,20 +115,20 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"IBZDepartment" }, notes = "createBatch") @ApiOperation(value = "批量新建部门", tags = {"部门" }, notes = "批量新建部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
ibzdepartmentService.createBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos)); ibzdepartmentService.createBatch(ibzdepartmentMapping.toDomain(ibzdepartmentdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"IBZDepartment" }, notes = "GetDraft") @ApiOperation(value = "获取部门草稿", tags = {"部门" }, notes = "获取部门草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/getdraft")
public ResponseEntity<IBZDepartmentDTO> getDraft() { public ResponseEntity<IBZDepartmentDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentMapping.toDto(ibzdepartmentService.getDraft(new IBZDepartment()))); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentMapping.toDto(ibzdepartmentService.getDraft(new IBZDepartment())));
} }
@ApiOperation(value = "fetchCurDept", tags = {"IBZDepartment" } ,notes = "fetchCurDept") @ApiOperation(value = "获取CurDept", tags = {"部门" } ,notes = "获取CurDept")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchcurdept") @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchcurdept")
public ResponseEntity<List<IBZDepartmentDTO>> fetchCurDept(IBZDepartmentSearchContext context) { public ResponseEntity<List<IBZDepartmentDTO>> fetchCurDept(IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ; Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ;
...@@ -140,14 +140,14 @@ public class IBZDepartmentResource { ...@@ -140,14 +140,14 @@ public class IBZDepartmentResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchCurDept", tags = {"IBZDepartment" } ,notes = "searchCurDept") @ApiOperation(value = "查询CurDept", tags = {"部门" } ,notes = "查询CurDept")
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchcurdept") @RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchCurDept(@RequestBody IBZDepartmentSearchContext context) { public ResponseEntity<Page<IBZDepartmentDTO>> searchCurDept(@RequestBody IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ; Page<IBZDepartment> domains = ibzdepartmentService.searchCurDept(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDepartment" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"部门" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/fetchdefault")
public ResponseEntity<List<IBZDepartmentDTO>> fetchDefault(IBZDepartmentSearchContext context) { public ResponseEntity<List<IBZDepartmentDTO>> fetchDefault(IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ; Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ;
...@@ -159,14 +159,14 @@ public class IBZDepartmentResource { ...@@ -159,14 +159,14 @@ public class IBZDepartmentResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"IBZDepartment" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"部门" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchDefault(@RequestBody IBZDepartmentSearchContext context) { public ResponseEntity<Page<IBZDepartmentDTO>> searchDefault(@RequestBody IBZDepartmentSearchContext context) {
Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ; Page<IBZDepartment> domains = ibzdepartmentService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "SaveByIBZOrganization", tags = {"IBZDepartment" }, notes = "SaveByIBZOrganization") @ApiOperation(value = "根据单位机构保存部门", tags = {"部门" }, notes = "根据单位机构保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/save")
public ResponseEntity<Boolean> saveByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<Boolean> saveByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
IBZDepartment domain = ibzdepartmentMapping.toDomain(ibzdepartmentdto); IBZDepartment domain = ibzdepartmentMapping.toDomain(ibzdepartmentdto);
...@@ -174,7 +174,7 @@ public class IBZDepartmentResource { ...@@ -174,7 +174,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganization", tags = {"IBZDepartment" }, notes = "SaveBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量保存部门", tags = {"部门" }, notes = "根据单位机构批量保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos); List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos);
...@@ -185,7 +185,7 @@ public class IBZDepartmentResource { ...@@ -185,7 +185,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZOrganization", tags = {"IBZDepartment" }, notes = "GetByIBZOrganization") @ApiOperation(value = "根据单位机构获取部门", tags = {"部门" }, notes = "根据单位机构获取部门")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<IBZDepartmentDTO> getByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZDepartmentDTO> getByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZDepartment domain = ibzdepartmentService.get(ibzdepartment_id); IBZDepartment domain = ibzdepartmentService.get(ibzdepartment_id);
...@@ -193,27 +193,27 @@ public class IBZDepartmentResource { ...@@ -193,27 +193,27 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "RemoveByIBZOrganization", tags = {"IBZDepartment" }, notes = "RemoveByIBZOrganization") @ApiOperation(value = "根据单位机构删除部门", tags = {"部门" }, notes = "根据单位机构删除部门")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<Boolean> removeByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<Boolean> removeByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.remove(ibzdepartment_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.remove(ibzdepartment_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganization", tags = {"IBZDepartment" }, notes = "RemoveBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量删除部门", tags = {"部门" }, notes = "根据单位机构批量删除部门")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganization(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganization(@RequestBody List<String> ids) {
ibzdepartmentService.removeBatch(ids); ibzdepartmentService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByIBZOrganization", tags = {"IBZDepartment" }, notes = "CheckKeyByIBZOrganization") @ApiOperation(value = "根据单位机构检查部门", tags = {"部门" }, notes = "根据单位机构检查部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<Boolean> checkKeyByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.checkKey(ibzdepartmentMapping.toDomain(ibzdepartmentdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentService.checkKey(ibzdepartmentMapping.toDomain(ibzdepartmentdto)));
} }
@ApiOperation(value = "UpdateByIBZOrganization", tags = {"IBZDepartment" }, notes = "UpdateByIBZOrganization") @ApiOperation(value = "根据单位机构更新部门", tags = {"部门" }, notes = "根据单位机构更新部门")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}")
public ResponseEntity<IBZDepartmentDTO> updateByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<IBZDepartmentDTO> updateByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
...@@ -225,7 +225,7 @@ public class IBZDepartmentResource { ...@@ -225,7 +225,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganization", tags = {"IBZDepartment" }, notes = "UpdateBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量更新部门", tags = {"部门" }, notes = "根据单位机构批量更新部门")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos); List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos);
...@@ -236,7 +236,7 @@ public class IBZDepartmentResource { ...@@ -236,7 +236,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZOrganization", tags = {"IBZDepartment" }, notes = "CreateByIBZOrganization") @ApiOperation(value = "根据单位机构建立部门", tags = {"部门" }, notes = "根据单位机构建立部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments")
public ResponseEntity<IBZDepartmentDTO> createByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) { public ResponseEntity<IBZDepartmentDTO> createByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentDTO ibzdepartmentdto) {
...@@ -247,7 +247,7 @@ public class IBZDepartmentResource { ...@@ -247,7 +247,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganization", tags = {"IBZDepartment" }, notes = "createBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量建立部门", tags = {"部门" }, notes = "根据单位机构批量建立部门")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) { public ResponseEntity<Boolean> createBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZDepartmentDTO> ibzdepartmentdtos) {
List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos); List<IBZDepartment> domainlist=ibzdepartmentMapping.toDomain(ibzdepartmentdtos);
...@@ -258,7 +258,7 @@ public class IBZDepartmentResource { ...@@ -258,7 +258,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZOrganization", tags = {"IBZDepartment" }, notes = "GetDraftByIBZOrganization") @ApiOperation(value = "根据单位机构获取部门草稿", tags = {"部门" }, notes = "根据单位机构获取部门草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/getdraft")
public ResponseEntity<IBZDepartmentDTO> getDraftByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id) { public ResponseEntity<IBZDepartmentDTO> getDraftByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id) {
IBZDepartment domain = new IBZDepartment(); IBZDepartment domain = new IBZDepartment();
...@@ -266,7 +266,7 @@ public class IBZDepartmentResource { ...@@ -266,7 +266,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentMapping.toDto(ibzdepartmentService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdepartmentMapping.toDto(ibzdepartmentService.getDraft(domain)));
} }
@ApiOperation(value = "fetchCurDeptByIBZOrganization", tags = {"IBZDepartment" } ,notes = "fetchCurDeptByIBZOrganization") @ApiOperation(value = "根据单位机构获取CurDept", tags = {"部门" } ,notes = "根据单位机构获取CurDept")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/fetchcurdept") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/fetchcurdept")
public ResponseEntity<List<IBZDepartmentDTO>> fetchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) { public ResponseEntity<List<IBZDepartmentDTO>> fetchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
...@@ -279,7 +279,7 @@ public class IBZDepartmentResource { ...@@ -279,7 +279,7 @@ public class IBZDepartmentResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchCurDeptByIBZOrganization", tags = {"IBZDepartment" } ,notes = "searchCurDeptByIBZOrganization") @ApiOperation(value = "根据单位机构查询CurDept", tags = {"部门" } ,notes = "根据单位机构查询CurDept")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchcurdept") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchcurdept")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) { public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentCurDeptByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
...@@ -287,7 +287,7 @@ public class IBZDepartmentResource { ...@@ -287,7 +287,7 @@ public class IBZDepartmentResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdepartmentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganization", tags = {"IBZDepartment" } ,notes = "fetchDEFAULTByIBZOrganization") @ApiOperation(value = "根据单位机构获取DEFAULT", tags = {"部门" } ,notes = "根据单位机构获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/fetchdefault")
public ResponseEntity<List<IBZDepartmentDTO>> fetchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) { public ResponseEntity<List<IBZDepartmentDTO>> fetchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
...@@ -300,7 +300,7 @@ public class IBZDepartmentResource { ...@@ -300,7 +300,7 @@ public class IBZDepartmentResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganization", tags = {"IBZDepartment" } ,notes = "searchDEFAULTByIBZOrganization") @ApiOperation(value = "根据单位机构查询DEFAULT", tags = {"部门" } ,notes = "根据单位机构查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/searchdefault")
public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) { public ResponseEntity<Page<IBZDepartmentDTO>> searchIBZDepartmentDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZDepartmentSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZDeptMemberService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZDeptMemberService;
import cn.ibizlab.core.ou.filter.IBZDeptMemberSearchContext; import cn.ibizlab.core.ou.filter.IBZDeptMemberSearchContext;
@Slf4j @Slf4j
@Api(tags = {"IBZDeptMember" }) @Api(tags = {"部门成员" })
@RestController("api-ibzdeptmember") @RestController("api-ibzdeptmember")
@RequestMapping("") @RequestMapping("")
public class IBZDeptMemberResource { public class IBZDeptMemberResource {
...@@ -46,7 +46,7 @@ public class IBZDeptMemberResource { ...@@ -46,7 +46,7 @@ public class IBZDeptMemberResource {
@Lazy @Lazy
public IBZDeptMemberMapping ibzdeptmemberMapping; public IBZDeptMemberMapping ibzdeptmemberMapping;
@ApiOperation(value = "Update", tags = {"IBZDeptMember" }, notes = "Update") @ApiOperation(value = "更新部门成员", tags = {"部门成员" }, notes = "更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> update(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> update(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -57,14 +57,14 @@ public class IBZDeptMemberResource { ...@@ -57,14 +57,14 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"IBZDeptMember" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新部门成员", tags = {"部门成员" }, notes = "批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
ibzdeptmemberService.updateBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos)); ibzdeptmemberService.updateBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"IBZDeptMember" }, notes = "Get") @ApiOperation(value = "获取部门成员", tags = {"部门成员" }, notes = "获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> get(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> get(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -72,27 +72,27 @@ public class IBZDeptMemberResource { ...@@ -72,27 +72,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKey", tags = {"IBZDeptMember" }, notes = "CheckKey") @ApiOperation(value = "检查部门成员", tags = {"部门成员" }, notes = "检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKey(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "Remove", tags = {"IBZDeptMember" }, notes = "Remove") @ApiOperation(value = "删除部门成员", tags = {"部门成员" }, notes = "删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> remove(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> remove(@PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"IBZDeptMember" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除部门成员", tags = {"部门成员" }, notes = "批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"IBZDeptMember" }, notes = "Create") @ApiOperation(value = "新建部门成员", tags = {"部门成员" }, notes = "新建部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> create(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> create(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -102,33 +102,33 @@ public class IBZDeptMemberResource { ...@@ -102,33 +102,33 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"IBZDeptMember" }, notes = "createBatch") @ApiOperation(value = "批量新建部门成员", tags = {"部门成员" }, notes = "批量新建部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
ibzdeptmemberService.createBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos)); ibzdeptmemberService.createBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"IBZDeptMember" }, notes = "GetDraft") @ApiOperation(value = "获取部门成员草稿", tags = {"部门成员" }, notes = "获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraft() { public ResponseEntity<IBZDeptMemberDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(new IBZDeptMember()))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(new IBZDeptMember())));
} }
@ApiOperation(value = "Save", tags = {"IBZDeptMember" }, notes = "Save") @ApiOperation(value = "保存部门成员", tags = {"部门成员" }, notes = "保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/save")
public ResponseEntity<Boolean> save(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> save(@RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"IBZDeptMember" }, notes = "SaveBatch") @ApiOperation(value = "批量保存部门成员", tags = {"部门成员" }, notes = "批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
ibzdeptmemberService.saveBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos)); ibzdeptmemberService.saveBatch(ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"部门成员" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchDefault(IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchDefault(IBZDeptMemberSearchContext context) {
Page<IBZDeptMember> domains = ibzdeptmemberService.searchDefault(context) ; Page<IBZDeptMember> domains = ibzdeptmemberService.searchDefault(context) ;
...@@ -140,14 +140,14 @@ public class IBZDeptMemberResource { ...@@ -140,14 +140,14 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"IBZDeptMember" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"部门成员" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchDefault(@RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchDefault(@RequestBody IBZDeptMemberSearchContext context) {
Page<IBZDeptMember> domains = ibzdeptmemberService.searchDefault(context) ; Page<IBZDeptMember> domains = ibzdeptmemberService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZDepartment", tags = {"IBZDeptMember" }, notes = "UpdateByIBZDepartment") @ApiOperation(value = "根据部门更新部门成员", tags = {"部门成员" }, notes = "根据部门更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -159,7 +159,7 @@ public class IBZDeptMemberResource { ...@@ -159,7 +159,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZDepartment", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZDepartment") @ApiOperation(value = "根据部门批量更新部门成员", tags = {"部门成员" }, notes = "根据部门批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -170,7 +170,7 @@ public class IBZDeptMemberResource { ...@@ -170,7 +170,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZDepartment", tags = {"IBZDeptMember" }, notes = "GetByIBZDepartment") @ApiOperation(value = "根据部门获取部门成员", tags = {"部门成员" }, notes = "根据部门获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -178,27 +178,27 @@ public class IBZDeptMemberResource { ...@@ -178,27 +178,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZDepartment", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZDepartment") @ApiOperation(value = "根据部门检查部门成员", tags = {"部门成员" }, notes = "根据部门检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZDepartment", tags = {"IBZDeptMember" }, notes = "RemoveByIBZDepartment") @ApiOperation(value = "根据部门删除部门成员", tags = {"部门成员" }, notes = "根据部门删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZDepartment", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZDepartment") @ApiOperation(value = "根据部门批量删除部门成员", tags = {"部门成员" }, notes = "根据部门批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZDepartment(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZDepartment(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZDepartment", tags = {"IBZDeptMember" }, notes = "CreateByIBZDepartment") @ApiOperation(value = "根据部门建立部门成员", tags = {"部门成员" }, notes = "根据部门建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -209,7 +209,7 @@ public class IBZDeptMemberResource { ...@@ -209,7 +209,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZDepartment", tags = {"IBZDeptMember" }, notes = "createBatchByIBZDepartment") @ApiOperation(value = "根据部门批量建立部门成员", tags = {"部门成员" }, notes = "根据部门批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -220,7 +220,7 @@ public class IBZDeptMemberResource { ...@@ -220,7 +220,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZDepartment", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZDepartment") @ApiOperation(value = "根据部门获取部门成员草稿", tags = {"部门成员" }, notes = "根据部门获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -228,7 +228,7 @@ public class IBZDeptMemberResource { ...@@ -228,7 +228,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZDepartment", tags = {"IBZDeptMember" }, notes = "SaveByIBZDepartment") @ApiOperation(value = "根据部门保存部门成员", tags = {"部门成员" }, notes = "根据部门保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -236,7 +236,7 @@ public class IBZDeptMemberResource { ...@@ -236,7 +236,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZDepartment", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZDepartment") @ApiOperation(value = "根据部门批量保存部门成员", tags = {"部门成员" }, notes = "根据部门批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -247,7 +247,7 @@ public class IBZDeptMemberResource { ...@@ -247,7 +247,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZDepartment", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZDepartment") @ApiOperation(value = "根据部门获取DEFAULT", tags = {"部门成员" } ,notes = "根据部门获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzdepartment_id); context.setN_userid_eq(ibzdepartment_id);
...@@ -260,7 +260,7 @@ public class IBZDeptMemberResource { ...@@ -260,7 +260,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZDepartment", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZDepartment") @ApiOperation(value = "根据部门查询DEFAULT", tags = {"部门成员" } ,notes = "根据部门查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzdepartment_id); context.setN_userid_eq(ibzdepartment_id);
...@@ -268,7 +268,7 @@ public class IBZDeptMemberResource { ...@@ -268,7 +268,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateByIBZEmployee") @ApiOperation(value = "根据人员更新部门成员", tags = {"部门成员" }, notes = "根据人员更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -280,7 +280,7 @@ public class IBZDeptMemberResource { ...@@ -280,7 +280,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZEmployee") @ApiOperation(value = "根据人员批量更新部门成员", tags = {"部门成员" }, notes = "根据人员批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -291,7 +291,7 @@ public class IBZDeptMemberResource { ...@@ -291,7 +291,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetByIBZEmployee") @ApiOperation(value = "根据人员获取部门成员", tags = {"部门成员" }, notes = "根据人员获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -299,27 +299,27 @@ public class IBZDeptMemberResource { ...@@ -299,27 +299,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZEmployee", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZEmployee") @ApiOperation(value = "根据人员检查部门成员", tags = {"部门成员" }, notes = "根据人员检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveByIBZEmployee") @ApiOperation(value = "根据人员删除部门成员", tags = {"部门成员" }, notes = "根据人员删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZEmployee") @ApiOperation(value = "根据人员批量删除部门成员", tags = {"部门成员" }, notes = "根据人员批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZEmployee(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZEmployee(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZEmployee", tags = {"IBZDeptMember" }, notes = "CreateByIBZEmployee") @ApiOperation(value = "根据人员建立部门成员", tags = {"部门成员" }, notes = "根据人员建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -330,7 +330,7 @@ public class IBZDeptMemberResource { ...@@ -330,7 +330,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZEmployee", tags = {"IBZDeptMember" }, notes = "createBatchByIBZEmployee") @ApiOperation(value = "根据人员批量建立部门成员", tags = {"部门成员" }, notes = "根据人员批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -341,7 +341,7 @@ public class IBZDeptMemberResource { ...@@ -341,7 +341,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZEmployee") @ApiOperation(value = "根据人员获取部门成员草稿", tags = {"部门成员" }, notes = "根据人员获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -349,7 +349,7 @@ public class IBZDeptMemberResource { ...@@ -349,7 +349,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveByIBZEmployee") @ApiOperation(value = "根据人员保存部门成员", tags = {"部门成员" }, notes = "根据人员保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -357,7 +357,7 @@ public class IBZDeptMemberResource { ...@@ -357,7 +357,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZEmployee") @ApiOperation(value = "根据人员批量保存部门成员", tags = {"部门成员" }, notes = "根据人员批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -368,7 +368,7 @@ public class IBZDeptMemberResource { ...@@ -368,7 +368,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZEmployee", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZEmployee") @ApiOperation(value = "根据人员获取DEFAULT", tags = {"部门成员" } ,notes = "根据人员获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -381,7 +381,7 @@ public class IBZDeptMemberResource { ...@@ -381,7 +381,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZEmployee", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZEmployee") @ApiOperation(value = "根据人员查询DEFAULT", tags = {"部门成员" } ,notes = "根据人员查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZEmployee(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -389,7 +389,7 @@ public class IBZDeptMemberResource { ...@@ -389,7 +389,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员更新部门成员", tags = {"部门成员" }, notes = "根据部门人员更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -401,7 +401,7 @@ public class IBZDeptMemberResource { ...@@ -401,7 +401,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员批量更新部门成员", tags = {"部门成员" }, notes = "根据部门人员批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -412,7 +412,7 @@ public class IBZDeptMemberResource { ...@@ -412,7 +412,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员获取部门成员", tags = {"部门成员" }, notes = "根据部门人员获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -420,27 +420,27 @@ public class IBZDeptMemberResource { ...@@ -420,27 +420,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员检查部门成员", tags = {"部门成员" }, notes = "根据部门人员检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员删除部门成员", tags = {"部门成员" }, notes = "根据部门人员删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员批量删除部门成员", tags = {"部门成员" }, notes = "根据部门人员批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZDepartmentIBZEmployee(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZDepartmentIBZEmployee(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "CreateByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员建立部门成员", tags = {"部门成员" }, notes = "根据部门人员建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -451,7 +451,7 @@ public class IBZDeptMemberResource { ...@@ -451,7 +451,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "createBatchByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员批量建立部门成员", tags = {"部门成员" }, notes = "根据部门人员批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -462,7 +462,7 @@ public class IBZDeptMemberResource { ...@@ -462,7 +462,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员获取部门成员草稿", tags = {"部门成员" }, notes = "根据部门人员获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -470,7 +470,7 @@ public class IBZDeptMemberResource { ...@@ -470,7 +470,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员保存部门成员", tags = {"部门成员" }, notes = "根据部门人员保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -478,7 +478,7 @@ public class IBZDeptMemberResource { ...@@ -478,7 +478,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员批量保存部门成员", tags = {"部门成员" }, notes = "根据部门人员批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -489,7 +489,7 @@ public class IBZDeptMemberResource { ...@@ -489,7 +489,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员获取DEFAULT", tags = {"部门成员" } ,notes = "根据部门人员获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -502,7 +502,7 @@ public class IBZDeptMemberResource { ...@@ -502,7 +502,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZDepartmentIBZEmployee") @ApiOperation(value = "根据部门人员查询DEFAULT", tags = {"部门成员" } ,notes = "根据部门人员查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZDepartmentIBZEmployee(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -510,7 +510,7 @@ public class IBZDeptMemberResource { ...@@ -510,7 +510,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "UpdateByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门更新部门成员", tags = {"部门成员" }, notes = "根据单位机构部门更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -522,7 +522,7 @@ public class IBZDeptMemberResource { ...@@ -522,7 +522,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量更新部门成员", tags = {"部门成员" }, notes = "根据单位机构部门批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -533,7 +533,7 @@ public class IBZDeptMemberResource { ...@@ -533,7 +533,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "GetByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取部门成员", tags = {"部门成员" }, notes = "根据单位机构部门获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -541,27 +541,27 @@ public class IBZDeptMemberResource { ...@@ -541,27 +541,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门检查部门成员", tags = {"部门成员" }, notes = "根据单位机构部门检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "RemoveByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门删除部门成员", tags = {"部门成员" }, notes = "根据单位机构部门删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量删除部门成员", tags = {"部门成员" }, notes = "根据单位机构部门批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartment(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartment(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "CreateByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门建立部门成员", tags = {"部门成员" }, notes = "根据单位机构部门建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -572,7 +572,7 @@ public class IBZDeptMemberResource { ...@@ -572,7 +572,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "createBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量建立部门成员", tags = {"部门成员" }, notes = "根据单位机构部门批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -583,7 +583,7 @@ public class IBZDeptMemberResource { ...@@ -583,7 +583,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取部门成员草稿", tags = {"部门成员" }, notes = "根据单位机构部门获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -591,7 +591,7 @@ public class IBZDeptMemberResource { ...@@ -591,7 +591,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "SaveByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门保存部门成员", tags = {"部门成员" }, notes = "根据单位机构部门保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -599,7 +599,7 @@ public class IBZDeptMemberResource { ...@@ -599,7 +599,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量保存部门成员", tags = {"部门成员" }, notes = "根据单位机构部门批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -610,7 +610,7 @@ public class IBZDeptMemberResource { ...@@ -610,7 +610,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构部门获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzdepartment_id); context.setN_userid_eq(ibzdepartment_id);
...@@ -623,7 +623,7 @@ public class IBZDeptMemberResource { ...@@ -623,7 +623,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganizationIBZDepartment", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门查询DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构部门查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzdepartment_id); context.setN_userid_eq(ibzdepartment_id);
...@@ -631,7 +631,7 @@ public class IBZDeptMemberResource { ...@@ -631,7 +631,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员更新部门成员", tags = {"部门成员" }, notes = "根据单位机构人员更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -643,7 +643,7 @@ public class IBZDeptMemberResource { ...@@ -643,7 +643,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员批量更新部门成员", tags = {"部门成员" }, notes = "根据单位机构人员批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -654,7 +654,7 @@ public class IBZDeptMemberResource { ...@@ -654,7 +654,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员获取部门成员", tags = {"部门成员" }, notes = "根据单位机构人员获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -662,27 +662,27 @@ public class IBZDeptMemberResource { ...@@ -662,27 +662,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员检查部门成员", tags = {"部门成员" }, notes = "根据单位机构人员检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员删除部门成员", tags = {"部门成员" }, notes = "根据单位机构人员删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员批量删除部门成员", tags = {"部门成员" }, notes = "根据单位机构人员批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZEmployee(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZEmployee(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "CreateByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员建立部门成员", tags = {"部门成员" }, notes = "根据单位机构人员建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -693,7 +693,7 @@ public class IBZDeptMemberResource { ...@@ -693,7 +693,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "createBatchByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员批量建立部门成员", tags = {"部门成员" }, notes = "根据单位机构人员批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -704,7 +704,7 @@ public class IBZDeptMemberResource { ...@@ -704,7 +704,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员获取部门成员草稿", tags = {"部门成员" }, notes = "根据单位机构人员获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -712,7 +712,7 @@ public class IBZDeptMemberResource { ...@@ -712,7 +712,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员保存部门成员", tags = {"部门成员" }, notes = "根据单位机构人员保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -720,7 +720,7 @@ public class IBZDeptMemberResource { ...@@ -720,7 +720,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员批量保存部门成员", tags = {"部门成员" }, notes = "根据单位机构人员批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -731,7 +731,7 @@ public class IBZDeptMemberResource { ...@@ -731,7 +731,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员获取DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构人员获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -744,7 +744,7 @@ public class IBZDeptMemberResource { ...@@ -744,7 +744,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganizationIBZEmployee", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZOrganizationIBZEmployee") @ApiOperation(value = "根据单位机构人员查询DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构人员查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -752,7 +752,7 @@ public class IBZDeptMemberResource { ...@@ -752,7 +752,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzdeptmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "UpdateByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员更新部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> updateByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -764,7 +764,7 @@ public class IBZDeptMemberResource { ...@@ -764,7 +764,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "UpdateBatchByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员批量更新部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员批量更新部门成员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -775,7 +775,7 @@ public class IBZDeptMemberResource { ...@@ -775,7 +775,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员获取部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员获取部门成员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<IBZDeptMemberDTO> getByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id); IBZDeptMember domain = ibzdeptmemberService.get(ibzdeptmember_id);
...@@ -783,27 +783,27 @@ public class IBZDeptMemberResource { ...@@ -783,27 +783,27 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "CheckKeyByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "CheckKeyByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员检查部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员检查部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.checkKey(ibzdeptmemberMapping.toDomain(ibzdeptmemberdto)));
} }
@ApiOperation(value = "RemoveByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员删除部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/{ibzdeptmember_id}")
public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) { public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @PathVariable("ibzdeptmember_id") String ibzdeptmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.remove(ibzdeptmember_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "RemoveBatchByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员批量删除部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员批量删除部门成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartmentIBZEmployee(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartmentIBZEmployee(@RequestBody List<String> ids) {
ibzdeptmemberService.removeBatch(ids); ibzdeptmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "CreateByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员建立部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers")
public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<IBZDeptMemberDTO> createByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
...@@ -814,7 +814,7 @@ public class IBZDeptMemberResource { ...@@ -814,7 +814,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "createBatchByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员批量建立部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员批量建立部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -825,7 +825,7 @@ public class IBZDeptMemberResource { ...@@ -825,7 +825,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "GetDraftByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员获取部门成员草稿", tags = {"部门成员" }, notes = "根据单位机构部门人员获取部门成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/getdraft")
public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZDeptMemberDTO> getDraftByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZDeptMember domain = new IBZDeptMember(); IBZDeptMember domain = new IBZDeptMember();
...@@ -833,7 +833,7 @@ public class IBZDeptMemberResource { ...@@ -833,7 +833,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberMapping.toDto(ibzdeptmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员保存部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/save")
public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) { public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberDTO ibzdeptmemberdto) {
IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto); IBZDeptMember domain = ibzdeptmemberMapping.toDomain(ibzdeptmemberdto);
...@@ -841,7 +841,7 @@ public class IBZDeptMemberResource { ...@@ -841,7 +841,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzdeptmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" }, notes = "SaveBatchByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员批量保存部门成员", tags = {"部门成员" }, notes = "根据单位机构部门人员批量保存部门成员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody List<IBZDeptMemberDTO> ibzdeptmemberdtos) {
List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos); List<IBZDeptMember> domainlist=ibzdeptmemberMapping.toDomain(ibzdeptmemberdtos);
...@@ -852,7 +852,7 @@ public class IBZDeptMemberResource { ...@@ -852,7 +852,7 @@ public class IBZDeptMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" } ,notes = "fetchDEFAULTByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员获取DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构部门人员获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/fetchdefault")
public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) { public ResponseEntity<List<IBZDeptMemberDTO>> fetchIBZDeptMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id,IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
...@@ -865,7 +865,7 @@ public class IBZDeptMemberResource { ...@@ -865,7 +865,7 @@ public class IBZDeptMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganizationIBZDepartmentIBZEmployee", tags = {"IBZDeptMember" } ,notes = "searchDEFAULTByIBZOrganizationIBZDepartmentIBZEmployee") @ApiOperation(value = "根据单位机构部门人员查询DEFAULT", tags = {"部门成员" } ,notes = "根据单位机构部门人员查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/ibzdeptmembers/searchdefault")
public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) { public ResponseEntity<Page<IBZDeptMemberDTO>> searchIBZDeptMemberDefaultByIBZOrganizationIBZDepartmentIBZEmployee(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZDeptMemberSearchContext context) {
context.setN_userid_eq(ibzemployee_id); context.setN_userid_eq(ibzemployee_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZEmployeeService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZEmployeeService;
import cn.ibizlab.core.ou.filter.IBZEmployeeSearchContext; import cn.ibizlab.core.ou.filter.IBZEmployeeSearchContext;
@Slf4j @Slf4j
@Api(tags = {"IBZEmployee" }) @Api(tags = {"人员" })
@RestController("api-ibzemployee") @RestController("api-ibzemployee")
@RequestMapping("") @RequestMapping("")
public class IBZEmployeeResource { public class IBZEmployeeResource {
...@@ -46,21 +46,21 @@ public class IBZEmployeeResource { ...@@ -46,21 +46,21 @@ public class IBZEmployeeResource {
@Lazy @Lazy
public IBZEmployeeMapping ibzemployeeMapping; public IBZEmployeeMapping ibzemployeeMapping;
@ApiOperation(value = "Remove", tags = {"IBZEmployee" }, notes = "Remove") @ApiOperation(value = "删除人员", tags = {"人员" }, notes = "删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/{ibzemployee_id}")
public ResponseEntity<Boolean> remove(@PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<Boolean> remove(@PathVariable("ibzemployee_id") String ibzemployee_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"IBZEmployee" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除人员", tags = {"人员" }, notes = "批量删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzemployees/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzemployeeService.removeBatch(ids); ibzemployeeService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"IBZEmployee" }, notes = "Update") @ApiOperation(value = "更新人员", tags = {"人员" }, notes = "更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> update(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> update(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -71,20 +71,20 @@ public class IBZEmployeeResource { ...@@ -71,20 +71,20 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"IBZEmployee" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新人员", tags = {"人员" }, notes = "批量更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzemployees/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
ibzemployeeService.updateBatch(ibzemployeeMapping.toDomain(ibzemployeedtos)); ibzemployeeService.updateBatch(ibzemployeeMapping.toDomain(ibzemployeedtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"IBZEmployee" }, notes = "CheckKey") @ApiOperation(value = "检查人员", tags = {"人员" }, notes = "检查人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> checkKey(@RequestBody IBZEmployeeDTO ibzemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto)));
} }
@ApiOperation(value = "Get", tags = {"IBZEmployee" }, notes = "Get") @ApiOperation(value = "获取人员", tags = {"人员" }, notes = "获取人员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> get(@PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZEmployeeDTO> get(@PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZEmployee domain = ibzemployeeService.get(ibzemployee_id); IBZEmployee domain = ibzemployeeService.get(ibzemployee_id);
...@@ -92,20 +92,20 @@ public class IBZEmployeeResource { ...@@ -92,20 +92,20 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Save", tags = {"IBZEmployee" }, notes = "Save") @ApiOperation(value = "保存人员", tags = {"人员" }, notes = "保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/save")
public ResponseEntity<Boolean> save(@RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> save(@RequestBody IBZEmployeeDTO ibzemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(ibzemployeeMapping.toDomain(ibzemployeedto))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(ibzemployeeMapping.toDomain(ibzemployeedto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"IBZEmployee" }, notes = "SaveBatch") @ApiOperation(value = "批量保存人员", tags = {"人员" }, notes = "批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
ibzemployeeService.saveBatch(ibzemployeeMapping.toDomain(ibzemployeedtos)); ibzemployeeService.saveBatch(ibzemployeeMapping.toDomain(ibzemployeedtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "初始化密码", tags = {"IBZEmployee" }, notes = "初始化密码") @ApiOperation(value = "初始化密码", tags = {"人员" }, notes = "初始化密码")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/initpwd") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/{ibzemployee_id}/initpwd")
public ResponseEntity<IBZEmployeeDTO> initPwd(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> initPwd(@PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -116,13 +116,13 @@ public class IBZEmployeeResource { ...@@ -116,13 +116,13 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto);
} }
@ApiOperation(value = "GetDraft", tags = {"IBZEmployee" }, notes = "GetDraft") @ApiOperation(value = "获取人员草稿", tags = {"人员" }, notes = "获取人员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzemployees/getdraft")
public ResponseEntity<IBZEmployeeDTO> getDraft() { public ResponseEntity<IBZEmployeeDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(new IBZEmployee()))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(new IBZEmployee())));
} }
@ApiOperation(value = "Create", tags = {"IBZEmployee" }, notes = "Create") @ApiOperation(value = "新建人员", tags = {"人员" }, notes = "新建人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees")
public ResponseEntity<IBZEmployeeDTO> create(@RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> create(@RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -132,14 +132,14 @@ public class IBZEmployeeResource { ...@@ -132,14 +132,14 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"IBZEmployee" }, notes = "createBatch") @ApiOperation(value = "批量新建人员", tags = {"人员" }, notes = "批量新建人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzemployees/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
ibzemployeeService.createBatch(ibzemployeeMapping.toDomain(ibzemployeedtos)); ibzemployeeService.createBatch(ibzemployeeMapping.toDomain(ibzemployeedtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZEmployee" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"人员" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzemployees/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzemployees/fetchdefault")
public ResponseEntity<List<IBZEmployeeDTO>> fetchDefault(IBZEmployeeSearchContext context) { public ResponseEntity<List<IBZEmployeeDTO>> fetchDefault(IBZEmployeeSearchContext context) {
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ; Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
...@@ -151,28 +151,28 @@ public class IBZEmployeeResource { ...@@ -151,28 +151,28 @@ public class IBZEmployeeResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"IBZEmployee" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"人员" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzemployees/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchDefault(@RequestBody IBZEmployeeSearchContext context) { public ResponseEntity<Page<IBZEmployeeDTO>> searchDefault(@RequestBody IBZEmployeeSearchContext context) {
Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ; Page<IBZEmployee> domains = ibzemployeeService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "RemoveByIBZDepartment", tags = {"IBZEmployee" }, notes = "RemoveByIBZDepartment") @ApiOperation(value = "根据部门删除人员", tags = {"人员" }, notes = "根据部门删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<Boolean> removeByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<Boolean> removeByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id));
} }
@ApiOperation(value = "RemoveBatchByIBZDepartment", tags = {"IBZEmployee" }, notes = "RemoveBatchByIBZDepartment") @ApiOperation(value = "根据部门批量删除人员", tags = {"人员" }, notes = "根据部门批量删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> removeBatchByIBZDepartment(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZDepartment(@RequestBody List<String> ids) {
ibzemployeeService.removeBatch(ids); ibzemployeeService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "UpdateByIBZDepartment", tags = {"IBZEmployee" }, notes = "UpdateByIBZDepartment") @ApiOperation(value = "根据部门更新人员", tags = {"人员" }, notes = "根据部门更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> updateByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> updateByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -184,7 +184,7 @@ public class IBZEmployeeResource { ...@@ -184,7 +184,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZDepartment", tags = {"IBZEmployee" }, notes = "UpdateBatchByIBZDepartment") @ApiOperation(value = "根据部门批量更新人员", tags = {"人员" }, notes = "根据部门批量更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> updateBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> updateBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -195,13 +195,13 @@ public class IBZEmployeeResource { ...@@ -195,13 +195,13 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByIBZDepartment", tags = {"IBZEmployee" }, notes = "CheckKeyByIBZDepartment") @ApiOperation(value = "根据部门检查人员", tags = {"人员" }, notes = "根据部门检查人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> checkKeyByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto)));
} }
@ApiOperation(value = "GetByIBZDepartment", tags = {"IBZEmployee" }, notes = "GetByIBZDepartment") @ApiOperation(value = "根据部门获取人员", tags = {"人员" }, notes = "根据部门获取人员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> getByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZEmployeeDTO> getByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZEmployee domain = ibzemployeeService.get(ibzemployee_id); IBZEmployee domain = ibzemployeeService.get(ibzemployee_id);
...@@ -209,7 +209,7 @@ public class IBZEmployeeResource { ...@@ -209,7 +209,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "SaveByIBZDepartment", tags = {"IBZEmployee" }, notes = "SaveByIBZDepartment") @ApiOperation(value = "根据部门保存人员", tags = {"人员" }, notes = "根据部门保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/save")
public ResponseEntity<Boolean> saveByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> saveByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto); IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto);
...@@ -217,7 +217,7 @@ public class IBZEmployeeResource { ...@@ -217,7 +217,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZDepartment", tags = {"IBZEmployee" }, notes = "SaveBatchByIBZDepartment") @ApiOperation(value = "根据部门批量保存人员", tags = {"人员" }, notes = "根据部门批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> saveBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -228,7 +228,7 @@ public class IBZEmployeeResource { ...@@ -228,7 +228,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "初始化密码ByIBZDepartment", tags = {"IBZEmployee" }, notes = "初始化密码ByIBZDepartment") @ApiOperation(value = "根据部门人员", tags = {"人员" }, notes = "根据部门人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/initpwd") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/initpwd")
public ResponseEntity<IBZEmployeeDTO> initPwdByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> initPwdByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -239,7 +239,7 @@ public class IBZEmployeeResource { ...@@ -239,7 +239,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto);
} }
@ApiOperation(value = "GetDraftByIBZDepartment", tags = {"IBZEmployee" }, notes = "GetDraftByIBZDepartment") @ApiOperation(value = "根据部门获取人员草稿", tags = {"人员" }, notes = "根据部门获取人员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/getdraft")
public ResponseEntity<IBZEmployeeDTO> getDraftByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZEmployeeDTO> getDraftByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZEmployee domain = new IBZEmployee(); IBZEmployee domain = new IBZEmployee();
...@@ -247,7 +247,7 @@ public class IBZEmployeeResource { ...@@ -247,7 +247,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain)));
} }
@ApiOperation(value = "CreateByIBZDepartment", tags = {"IBZEmployee" }, notes = "CreateByIBZDepartment") @ApiOperation(value = "根据部门建立人员", tags = {"人员" }, notes = "根据部门建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees")
public ResponseEntity<IBZEmployeeDTO> createByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> createByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -258,7 +258,7 @@ public class IBZEmployeeResource { ...@@ -258,7 +258,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZDepartment", tags = {"IBZEmployee" }, notes = "createBatchByIBZDepartment") @ApiOperation(value = "根据部门批量建立人员", tags = {"人员" }, notes = "根据部门批量建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> createBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> createBatchByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -269,7 +269,7 @@ public class IBZEmployeeResource { ...@@ -269,7 +269,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZDepartment", tags = {"IBZEmployee" } ,notes = "fetchDEFAULTByIBZDepartment") @ApiOperation(value = "根据部门获取DEFAULT", tags = {"人员" } ,notes = "根据部门获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault")
public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) { public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id); context.setN_mdeptid_eq(ibzdepartment_id);
...@@ -282,7 +282,7 @@ public class IBZEmployeeResource { ...@@ -282,7 +282,7 @@ public class IBZEmployeeResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZDepartment", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZDepartment") @ApiOperation(value = "根据部门查询DEFAULT", tags = {"人员" } ,notes = "根据部门查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) { public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZDepartment(@PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id); context.setN_mdeptid_eq(ibzdepartment_id);
...@@ -290,21 +290,21 @@ public class IBZEmployeeResource { ...@@ -290,21 +290,21 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "RemoveByIBZOrganization", tags = {"IBZEmployee" }, notes = "RemoveByIBZOrganization") @ApiOperation(value = "根据单位机构删除人员", tags = {"人员" }, notes = "根据单位机构删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<Boolean> removeByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<Boolean> removeByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganization", tags = {"IBZEmployee" }, notes = "RemoveBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量删除人员", tags = {"人员" }, notes = "根据单位机构批量删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganization(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganization(@RequestBody List<String> ids) {
ibzemployeeService.removeBatch(ids); ibzemployeeService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "UpdateByIBZOrganization", tags = {"IBZEmployee" }, notes = "UpdateByIBZOrganization") @ApiOperation(value = "根据单位机构更新人员", tags = {"人员" }, notes = "根据单位机构更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> updateByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> updateByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -316,7 +316,7 @@ public class IBZEmployeeResource { ...@@ -316,7 +316,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganization", tags = {"IBZEmployee" }, notes = "UpdateBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量更新人员", tags = {"人员" }, notes = "根据单位机构批量更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -327,13 +327,13 @@ public class IBZEmployeeResource { ...@@ -327,13 +327,13 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByIBZOrganization", tags = {"IBZEmployee" }, notes = "CheckKeyByIBZOrganization") @ApiOperation(value = "根据单位机构检查人员", tags = {"人员" }, notes = "根据单位机构检查人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> checkKeyByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto)));
} }
@ApiOperation(value = "GetByIBZOrganization", tags = {"IBZEmployee" }, notes = "GetByIBZOrganization") @ApiOperation(value = "根据单位机构获取人员", tags = {"人员" }, notes = "根据单位机构获取人员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> getByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZEmployeeDTO> getByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZEmployee domain = ibzemployeeService.get(ibzemployee_id); IBZEmployee domain = ibzemployeeService.get(ibzemployee_id);
...@@ -341,7 +341,7 @@ public class IBZEmployeeResource { ...@@ -341,7 +341,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "SaveByIBZOrganization", tags = {"IBZEmployee" }, notes = "SaveByIBZOrganization") @ApiOperation(value = "根据单位机构保存人员", tags = {"人员" }, notes = "根据单位机构保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/save")
public ResponseEntity<Boolean> saveByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> saveByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto); IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto);
...@@ -349,7 +349,7 @@ public class IBZEmployeeResource { ...@@ -349,7 +349,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganization", tags = {"IBZEmployee" }, notes = "SaveBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量保存人员", tags = {"人员" }, notes = "根据单位机构批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -360,7 +360,7 @@ public class IBZEmployeeResource { ...@@ -360,7 +360,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "初始化密码ByIBZOrganization", tags = {"IBZEmployee" }, notes = "初始化密码ByIBZOrganization") @ApiOperation(value = "根据单位机构人员", tags = {"人员" }, notes = "根据单位机构人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/initpwd") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/{ibzemployee_id}/initpwd")
public ResponseEntity<IBZEmployeeDTO> initPwdByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> initPwdByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -371,7 +371,7 @@ public class IBZEmployeeResource { ...@@ -371,7 +371,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto);
} }
@ApiOperation(value = "GetDraftByIBZOrganization", tags = {"IBZEmployee" }, notes = "GetDraftByIBZOrganization") @ApiOperation(value = "根据单位机构获取人员草稿", tags = {"人员" }, notes = "根据单位机构获取人员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/getdraft")
public ResponseEntity<IBZEmployeeDTO> getDraftByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id) { public ResponseEntity<IBZEmployeeDTO> getDraftByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id) {
IBZEmployee domain = new IBZEmployee(); IBZEmployee domain = new IBZEmployee();
...@@ -379,7 +379,7 @@ public class IBZEmployeeResource { ...@@ -379,7 +379,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain)));
} }
@ApiOperation(value = "CreateByIBZOrganization", tags = {"IBZEmployee" }, notes = "CreateByIBZOrganization") @ApiOperation(value = "根据单位机构建立人员", tags = {"人员" }, notes = "根据单位机构建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees")
public ResponseEntity<IBZEmployeeDTO> createByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> createByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -390,7 +390,7 @@ public class IBZEmployeeResource { ...@@ -390,7 +390,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganization", tags = {"IBZEmployee" }, notes = "createBatchByIBZOrganization") @ApiOperation(value = "根据单位机构批量建立人员", tags = {"人员" }, notes = "根据单位机构批量建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzemployees/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> createBatchByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -401,7 +401,7 @@ public class IBZEmployeeResource { ...@@ -401,7 +401,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganization", tags = {"IBZEmployee" } ,notes = "fetchDEFAULTByIBZOrganization") @ApiOperation(value = "根据单位机构获取DEFAULT", tags = {"人员" } ,notes = "根据单位机构获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/fetchdefault")
public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZEmployeeSearchContext context) { public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id,IBZEmployeeSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
...@@ -414,7 +414,7 @@ public class IBZEmployeeResource { ...@@ -414,7 +414,7 @@ public class IBZEmployeeResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganization", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZOrganization") @ApiOperation(value = "根据单位机构查询DEFAULT", tags = {"人员" } ,notes = "根据单位机构查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeSearchContext context) { public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganization(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_orgid_eq(ibzorganization_id); context.setN_orgid_eq(ibzorganization_id);
...@@ -422,21 +422,21 @@ public class IBZEmployeeResource { ...@@ -422,21 +422,21 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzemployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "RemoveByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "RemoveByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门删除人员", tags = {"人员" }, notes = "根据单位机构部门删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<Boolean> removeByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.remove(ibzemployee_id));
} }
@ApiOperation(value = "RemoveBatchByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "RemoveBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量删除人员", tags = {"人员" }, notes = "根据单位机构部门批量删除人员")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartment(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByIBZOrganizationIBZDepartment(@RequestBody List<String> ids) {
ibzemployeeService.removeBatch(ids); ibzemployeeService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "UpdateByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "UpdateByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门更新人员", tags = {"人员" }, notes = "根据单位机构部门更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> updateByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> updateByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -448,7 +448,7 @@ public class IBZEmployeeResource { ...@@ -448,7 +448,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "UpdateBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量更新人员", tags = {"人员" }, notes = "根据单位机构部门批量更新人员")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> updateBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -459,13 +459,13 @@ public class IBZEmployeeResource { ...@@ -459,13 +459,13 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "CheckKeyByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门检查人员", tags = {"人员" }, notes = "根据单位机构部门检查人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/checkkey")
public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> checkKeyByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.checkKey(ibzemployeeMapping.toDomain(ibzemployeedto)));
} }
@ApiOperation(value = "GetByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "GetByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取人员", tags = {"人员" }, notes = "根据单位机构部门获取人员")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}")
public ResponseEntity<IBZEmployeeDTO> getByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) { public ResponseEntity<IBZEmployeeDTO> getByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id) {
IBZEmployee domain = ibzemployeeService.get(ibzemployee_id); IBZEmployee domain = ibzemployeeService.get(ibzemployee_id);
...@@ -473,7 +473,7 @@ public class IBZEmployeeResource { ...@@ -473,7 +473,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "SaveByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "SaveByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门保存人员", tags = {"人员" }, notes = "根据单位机构部门保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/save")
public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<Boolean> saveByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto); IBZEmployee domain = ibzemployeeMapping.toDomain(ibzemployeedto);
...@@ -481,7 +481,7 @@ public class IBZEmployeeResource { ...@@ -481,7 +481,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeService.save(domain));
} }
@ApiOperation(value = "SaveBatchByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "SaveBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量保存人员", tags = {"人员" }, notes = "根据单位机构部门批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/savebatch")
public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> saveBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -492,7 +492,7 @@ public class IBZEmployeeResource { ...@@ -492,7 +492,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "初始化密码ByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "初始化密码ByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门人员", tags = {"人员" }, notes = "根据单位机构部门人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/initpwd") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/{ibzemployee_id}/initpwd")
public ResponseEntity<IBZEmployeeDTO> initPwdByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> initPwdByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @PathVariable("ibzemployee_id") String ibzemployee_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -503,7 +503,7 @@ public class IBZEmployeeResource { ...@@ -503,7 +503,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeedto);
} }
@ApiOperation(value = "GetDraftByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "GetDraftByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取人员草稿", tags = {"人员" }, notes = "根据单位机构部门获取人员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/getdraft")
public ResponseEntity<IBZEmployeeDTO> getDraftByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) { public ResponseEntity<IBZEmployeeDTO> getDraftByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id) {
IBZEmployee domain = new IBZEmployee(); IBZEmployee domain = new IBZEmployee();
...@@ -511,7 +511,7 @@ public class IBZEmployeeResource { ...@@ -511,7 +511,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(ibzemployeeMapping.toDto(ibzemployeeService.getDraft(domain)));
} }
@ApiOperation(value = "CreateByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "CreateByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门建立人员", tags = {"人员" }, notes = "根据单位机构部门建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees")
public ResponseEntity<IBZEmployeeDTO> createByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) { public ResponseEntity<IBZEmployeeDTO> createByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeDTO ibzemployeedto) {
...@@ -522,7 +522,7 @@ public class IBZEmployeeResource { ...@@ -522,7 +522,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" }, notes = "createBatchByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门批量建立人员", tags = {"人员" }, notes = "根据单位机构部门批量建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/batch")
public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) { public ResponseEntity<Boolean> createBatchByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody List<IBZEmployeeDTO> ibzemployeedtos) {
List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos); List<IBZEmployee> domainlist=ibzemployeeMapping.toDomain(ibzemployeedtos);
...@@ -533,7 +533,7 @@ public class IBZEmployeeResource { ...@@ -533,7 +533,7 @@ public class IBZEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" } ,notes = "fetchDEFAULTByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门获取DEFAULT", tags = {"人员" } ,notes = "根据单位机构部门获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/fetchdefault")
public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) { public ResponseEntity<List<IBZEmployeeDTO>> fetchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id,IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id); context.setN_mdeptid_eq(ibzdepartment_id);
...@@ -546,7 +546,7 @@ public class IBZEmployeeResource { ...@@ -546,7 +546,7 @@ public class IBZEmployeeResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByIBZOrganizationIBZDepartment", tags = {"IBZEmployee" } ,notes = "searchDEFAULTByIBZOrganizationIBZDepartment") @ApiOperation(value = "根据单位机构部门查询DEFAULT", tags = {"人员" } ,notes = "根据单位机构部门查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/{ibzorganization_id}/ibzdepartments/{ibzdepartment_id}/ibzemployees/searchdefault")
public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) { public ResponseEntity<Page<IBZEmployeeDTO>> searchIBZEmployeeDefaultByIBZOrganizationIBZDepartment(@PathVariable("ibzorganization_id") String ibzorganization_id, @PathVariable("ibzdepartment_id") String ibzdepartment_id, @RequestBody IBZEmployeeSearchContext context) {
context.setN_mdeptid_eq(ibzdepartment_id); context.setN_mdeptid_eq(ibzdepartment_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZOrganizationService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZOrganizationService;
import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext; import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext;
@Slf4j @Slf4j
@Api(tags = {"IBZOrganization" }) @Api(tags = {"单位机构" })
@RestController("api-ibzorganization") @RestController("api-ibzorganization")
@RequestMapping("") @RequestMapping("")
public class IBZOrganizationResource { public class IBZOrganizationResource {
...@@ -46,26 +46,26 @@ public class IBZOrganizationResource { ...@@ -46,26 +46,26 @@ public class IBZOrganizationResource {
@Lazy @Lazy
public IBZOrganizationMapping ibzorganizationMapping; public IBZOrganizationMapping ibzorganizationMapping;
@ApiOperation(value = "Save", tags = {"IBZOrganization" }, notes = "Save") @ApiOperation(value = "保存单位机构", tags = {"单位机构" }, notes = "保存单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save")
public ResponseEntity<Boolean> save(@RequestBody IBZOrganizationDTO ibzorganizationdto) { public ResponseEntity<Boolean> save(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.save(ibzorganizationMapping.toDomain(ibzorganizationdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.save(ibzorganizationMapping.toDomain(ibzorganizationdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"IBZOrganization" }, notes = "SaveBatch") @ApiOperation(value = "批量保存单位机构", tags = {"单位机构" }, notes = "批量保存单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.saveBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos)); ibzorganizationService.saveBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"IBZOrganization" }, notes = "CheckKey") @ApiOperation(value = "检查单位机构", tags = {"单位机构" }, notes = "检查单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZOrganizationDTO ibzorganizationdto) { public ResponseEntity<Boolean> checkKey(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.checkKey(ibzorganizationMapping.toDomain(ibzorganizationdto))); return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.checkKey(ibzorganizationMapping.toDomain(ibzorganizationdto)));
} }
@ApiOperation(value = "Get", tags = {"IBZOrganization" }, notes = "Get") @ApiOperation(value = "获取单位机构", tags = {"单位机构" }, notes = "获取单位机构")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/{ibzorganization_id}")
public ResponseEntity<IBZOrganizationDTO> get(@PathVariable("ibzorganization_id") String ibzorganization_id) { public ResponseEntity<IBZOrganizationDTO> get(@PathVariable("ibzorganization_id") String ibzorganization_id) {
IBZOrganization domain = ibzorganizationService.get(ibzorganization_id); IBZOrganization domain = ibzorganizationService.get(ibzorganization_id);
...@@ -73,7 +73,7 @@ public class IBZOrganizationResource { ...@@ -73,7 +73,7 @@ public class IBZOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Create", tags = {"IBZOrganization" }, notes = "Create") @ApiOperation(value = "新建单位机构", tags = {"单位机构" }, notes = "新建单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations")
public ResponseEntity<IBZOrganizationDTO> create(@RequestBody IBZOrganizationDTO ibzorganizationdto) { public ResponseEntity<IBZOrganizationDTO> create(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
...@@ -83,34 +83,34 @@ public class IBZOrganizationResource { ...@@ -83,34 +83,34 @@ public class IBZOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"IBZOrganization" }, notes = "createBatch") @ApiOperation(value = "批量新建单位机构", tags = {"单位机构" }, notes = "批量新建单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/batch") @RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.createBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos)); ibzorganizationService.createBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Remove", tags = {"IBZOrganization" }, notes = "Remove") @ApiOperation(value = "删除单位机构", tags = {"单位机构" }, notes = "删除单位机构")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/{ibzorganization_id}")
public ResponseEntity<Boolean> remove(@PathVariable("ibzorganization_id") String ibzorganization_id) { public ResponseEntity<Boolean> remove(@PathVariable("ibzorganization_id") String ibzorganization_id) {
return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.remove(ibzorganization_id)); return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationService.remove(ibzorganization_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"IBZOrganization" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除单位机构", tags = {"单位机构" }, notes = "批量删除单位机构")
@RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/ibzorganizations/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzorganizationService.removeBatch(ids); ibzorganizationService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"IBZOrganization" }, notes = "GetDraft") @ApiOperation(value = "获取单位机构草稿", tags = {"单位机构" }, notes = "获取单位机构草稿")
@RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/ibzorganizations/getdraft")
public ResponseEntity<IBZOrganizationDTO> getDraft() { public ResponseEntity<IBZOrganizationDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationMapping.toDto(ibzorganizationService.getDraft(new IBZOrganization()))); return ResponseEntity.status(HttpStatus.OK).body(ibzorganizationMapping.toDto(ibzorganizationService.getDraft(new IBZOrganization())));
} }
@ApiOperation(value = "Update", tags = {"IBZOrganization" }, notes = "Update") @ApiOperation(value = "更新单位机构", tags = {"单位机构" }, notes = "更新单位机构")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/{ibzorganization_id}")
public ResponseEntity<IBZOrganizationDTO> update(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZOrganizationDTO ibzorganizationdto) { public ResponseEntity<IBZOrganizationDTO> update(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZOrganizationDTO ibzorganizationdto) {
...@@ -121,14 +121,14 @@ public class IBZOrganizationResource { ...@@ -121,14 +121,14 @@ public class IBZOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"IBZOrganization" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新单位机构", tags = {"单位机构" }, notes = "批量更新单位机构")
@RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/batch") @RequestMapping(method = RequestMethod.PUT, value = "/ibzorganizations/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.updateBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos)); ibzorganizationService.updateBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"IBZOrganization" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"单位机构" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchdefault")
public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) { public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
...@@ -140,14 +140,14 @@ public class IBZOrganizationResource { ...@@ -140,14 +140,14 @@ public class IBZOrganizationResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"IBZOrganization" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"单位机构" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchdefault")
public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(@RequestBody IBZOrganizationSearchContext context) { public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "fetch查询上级单位", tags = {"IBZOrganization" } ,notes = "fetch查询上级单位") @ApiOperation(value = "获取查询上级单位", tags = {"单位机构" } ,notes = "获取查询上级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectporg") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectporg")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectPOrg(IBZOrganizationSearchContext context) { public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectPOrg(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ;
...@@ -159,14 +159,14 @@ public class IBZOrganizationResource { ...@@ -159,14 +159,14 @@ public class IBZOrganizationResource {
.body(list); .body(list);
} }
@ApiOperation(value = "search查询上级单位", tags = {"IBZOrganization" } ,notes = "search查询上级单位") @ApiOperation(value = "查询查询上级单位", tags = {"单位机构" } ,notes = "查询查询上级单位")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectporg") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectporg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(@RequestBody IBZOrganizationSearchContext context) { public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(ibzorganizationMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "fetch查询下级单位", tags = {"IBZOrganization" } ,notes = "fetch查询下级单位") @ApiOperation(value = "获取查询下级单位", tags = {"单位机构" } ,notes = "获取查询下级单位")
@RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectsorg") @RequestMapping(method= RequestMethod.GET , value="/ibzorganizations/fetchselectsorg")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectSOrg(IBZOrganizationSearchContext context) { public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectSOrg(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ;
...@@ -178,7 +178,7 @@ public class IBZOrganizationResource { ...@@ -178,7 +178,7 @@ public class IBZOrganizationResource {
.body(list); .body(list);
} }
@ApiOperation(value = "search查询下级单位", tags = {"IBZOrganization" } ,notes = "search查询下级单位") @ApiOperation(value = "查询查询下级单位", tags = {"单位机构" } ,notes = "查询查询下级单位")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectsorg") @RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectsorg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(@RequestBody IBZOrganizationSearchContext context) { public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ; Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysAuthLogService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysAuthLogService;
import cn.ibizlab.core.uaa.filter.SysAuthLogSearchContext; import cn.ibizlab.core.uaa.filter.SysAuthLogSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysAuthLog" }) @Api(tags = {"认证日志" })
@RestController("api-sysauthlog") @RestController("api-sysauthlog")
@RequestMapping("") @RequestMapping("")
public class SysAuthLogResource { public class SysAuthLogResource {
...@@ -46,33 +46,33 @@ public class SysAuthLogResource { ...@@ -46,33 +46,33 @@ public class SysAuthLogResource {
@Lazy @Lazy
public SysAuthLogMapping sysauthlogMapping; public SysAuthLogMapping sysauthlogMapping;
@ApiOperation(value = "CheckKey", tags = {"SysAuthLog" }, notes = "CheckKey") @ApiOperation(value = "检查认证日志", tags = {"认证日志" }, notes = "检查认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysAuthLogDTO sysauthlogdto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysAuthLogDTO sysauthlogdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.checkKey(sysauthlogMapping.toDomain(sysauthlogdto))); return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.checkKey(sysauthlogMapping.toDomain(sysauthlogdto)));
} }
@ApiOperation(value = "Remove", tags = {"SysAuthLog" }, notes = "Remove") @ApiOperation(value = "删除认证日志", tags = {"认证日志" }, notes = "删除认证日志")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/{sysauthlog_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/{sysauthlog_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysauthlog_id") String sysauthlog_id) { public ResponseEntity<Boolean> remove(@PathVariable("sysauthlog_id") String sysauthlog_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.remove(sysauthlog_id)); return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.remove(sysauthlog_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysAuthLog" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除认证日志", tags = {"认证日志" }, notes = "批量删除认证日志")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysauthlogService.removeBatch(ids); sysauthlogService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"SysAuthLog" }, notes = "GetDraft") @ApiOperation(value = "获取认证日志草稿", tags = {"认证日志" }, notes = "获取认证日志草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/getdraft")
public ResponseEntity<SysAuthLogDTO> getDraft() { public ResponseEntity<SysAuthLogDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogMapping.toDto(sysauthlogService.getDraft(new SysAuthLog()))); return ResponseEntity.status(HttpStatus.OK).body(sysauthlogMapping.toDto(sysauthlogService.getDraft(new SysAuthLog())));
} }
@ApiOperation(value = "Update", tags = {"SysAuthLog" }, notes = "Update") @ApiOperation(value = "更新认证日志", tags = {"认证日志" }, notes = "更新认证日志")
@RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/{sysauthlog_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/{sysauthlog_id}")
public ResponseEntity<SysAuthLogDTO> update(@PathVariable("sysauthlog_id") String sysauthlog_id, @RequestBody SysAuthLogDTO sysauthlogdto) { public ResponseEntity<SysAuthLogDTO> update(@PathVariable("sysauthlog_id") String sysauthlog_id, @RequestBody SysAuthLogDTO sysauthlogdto) {
...@@ -83,27 +83,27 @@ public class SysAuthLogResource { ...@@ -83,27 +83,27 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysAuthLog" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新认证日志", tags = {"认证日志" }, notes = "批量更新认证日志")
@RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.updateBatch(sysauthlogMapping.toDomain(sysauthlogdtos)); sysauthlogService.updateBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Save", tags = {"SysAuthLog" }, notes = "Save") @ApiOperation(value = "保存认证日志", tags = {"认证日志" }, notes = "保存认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/save") @RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/save")
public ResponseEntity<Boolean> save(@RequestBody SysAuthLogDTO sysauthlogdto) { public ResponseEntity<Boolean> save(@RequestBody SysAuthLogDTO sysauthlogdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.save(sysauthlogMapping.toDomain(sysauthlogdto))); return ResponseEntity.status(HttpStatus.OK).body(sysauthlogService.save(sysauthlogMapping.toDomain(sysauthlogdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysAuthLog" }, notes = "SaveBatch") @ApiOperation(value = "批量保存认证日志", tags = {"认证日志" }, notes = "批量保存认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.saveBatch(sysauthlogMapping.toDomain(sysauthlogdtos)); sysauthlogService.saveBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"SysAuthLog" }, notes = "Create") @ApiOperation(value = "新建认证日志", tags = {"认证日志" }, notes = "新建认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs") @RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs")
public ResponseEntity<SysAuthLogDTO> create(@RequestBody SysAuthLogDTO sysauthlogdto) { public ResponseEntity<SysAuthLogDTO> create(@RequestBody SysAuthLogDTO sysauthlogdto) {
...@@ -113,14 +113,14 @@ public class SysAuthLogResource { ...@@ -113,14 +113,14 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysAuthLog" }, notes = "createBatch") @ApiOperation(value = "批量新建认证日志", tags = {"认证日志" }, notes = "批量新建认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.createBatch(sysauthlogMapping.toDomain(sysauthlogdtos)); sysauthlogService.createBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"SysAuthLog" }, notes = "Get") @ApiOperation(value = "获取认证日志", tags = {"认证日志" }, notes = "获取认证日志")
@RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/{sysauthlog_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysauthlogs/{sysauthlog_id}")
public ResponseEntity<SysAuthLogDTO> get(@PathVariable("sysauthlog_id") String sysauthlog_id) { public ResponseEntity<SysAuthLogDTO> get(@PathVariable("sysauthlog_id") String sysauthlog_id) {
SysAuthLog domain = sysauthlogService.get(sysauthlog_id); SysAuthLog domain = sysauthlogService.get(sysauthlog_id);
...@@ -128,7 +128,7 @@ public class SysAuthLogResource { ...@@ -128,7 +128,7 @@ public class SysAuthLogResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysAuthLog" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"认证日志" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysauthlogs/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysauthlogs/fetchdefault")
public ResponseEntity<List<SysAuthLogDTO>> fetchDefault(SysAuthLogSearchContext context) { public ResponseEntity<List<SysAuthLogDTO>> fetchDefault(SysAuthLogSearchContext context) {
Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ; Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class SysAuthLogResource { ...@@ -140,7 +140,7 @@ public class SysAuthLogResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysAuthLog" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"认证日志" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysauthlogs/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysauthlogs/searchdefault")
public ResponseEntity<Page<SysAuthLogDTO>> searchDefault(@RequestBody SysAuthLogSearchContext context) { public ResponseEntity<Page<SysAuthLogDTO>> searchDefault(@RequestBody SysAuthLogSearchContext context) {
Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ; Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysPermissionService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysPermissionService;
import cn.ibizlab.core.uaa.filter.SysPermissionSearchContext; import cn.ibizlab.core.uaa.filter.SysPermissionSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysPermission" }) @Api(tags = {"权限/资源" })
@RestController("api-syspermission") @RestController("api-syspermission")
@RequestMapping("") @RequestMapping("")
public class SysPermissionResource { public class SysPermissionResource {
...@@ -46,40 +46,40 @@ public class SysPermissionResource { ...@@ -46,40 +46,40 @@ public class SysPermissionResource {
@Lazy @Lazy
public SysPermissionMapping syspermissionMapping; public SysPermissionMapping syspermissionMapping;
@ApiOperation(value = "Save", tags = {"SysPermission" }, notes = "Save") @ApiOperation(value = "保存权限/资源", tags = {"权限/资源" }, notes = "保存权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/save") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/save")
public ResponseEntity<Boolean> save(@RequestBody SysPermissionDTO syspermissiondto) { public ResponseEntity<Boolean> save(@RequestBody SysPermissionDTO syspermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.save(syspermissionMapping.toDomain(syspermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.save(syspermissionMapping.toDomain(syspermissiondto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysPermission" }, notes = "SaveBatch") @ApiOperation(value = "批量保存权限/资源", tags = {"权限/资源" }, notes = "批量保存权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.saveBatch(syspermissionMapping.toDomain(syspermissiondtos)); syspermissionService.saveBatch(syspermissionMapping.toDomain(syspermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"SysPermission" }, notes = "GetDraft") @ApiOperation(value = "获取权限/资源草稿", tags = {"权限/资源" }, notes = "获取权限/资源草稿")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/syspermissions/getdraft")
public ResponseEntity<SysPermissionDTO> getDraft() { public ResponseEntity<SysPermissionDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionMapping.toDto(syspermissionService.getDraft(new SysPermission()))); return ResponseEntity.status(HttpStatus.OK).body(syspermissionMapping.toDto(syspermissionService.getDraft(new SysPermission())));
} }
@ApiOperation(value = "Remove", tags = {"SysPermission" }, notes = "Remove") @ApiOperation(value = "删除权限/资源", tags = {"权限/资源" }, notes = "删除权限/资源")
@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}")
public ResponseEntity<Boolean> remove(@PathVariable("syspermission_id") String syspermission_id) { public ResponseEntity<Boolean> remove(@PathVariable("syspermission_id") String syspermission_id) {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.remove(syspermission_id)); return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.remove(syspermission_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysPermission" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除权限/资源", tags = {"权限/资源" }, notes = "批量删除权限/资源")
@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
syspermissionService.removeBatch(ids); syspermissionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"SysPermission" }, notes = "Update") @ApiOperation(value = "更新权限/资源", tags = {"权限/资源" }, notes = "更新权限/资源")
@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}") @RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}")
public ResponseEntity<SysPermissionDTO> update(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysPermissionDTO syspermissiondto) { public ResponseEntity<SysPermissionDTO> update(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysPermissionDTO syspermissiondto) {
...@@ -90,14 +90,14 @@ public class SysPermissionResource { ...@@ -90,14 +90,14 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysPermission" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新权限/资源", tags = {"权限/资源" }, notes = "批量更新权限/资源")
@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/batch") @RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.updateBatch(syspermissionMapping.toDomain(syspermissiondtos)); syspermissionService.updateBatch(syspermissionMapping.toDomain(syspermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"SysPermission" }, notes = "Create") @ApiOperation(value = "新建权限/资源", tags = {"权限/资源" }, notes = "新建权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions")
public ResponseEntity<SysPermissionDTO> create(@RequestBody SysPermissionDTO syspermissiondto) { public ResponseEntity<SysPermissionDTO> create(@RequestBody SysPermissionDTO syspermissiondto) {
...@@ -107,20 +107,20 @@ public class SysPermissionResource { ...@@ -107,20 +107,20 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysPermission" }, notes = "createBatch") @ApiOperation(value = "批量新建权限/资源", tags = {"权限/资源" }, notes = "批量新建权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/batch") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.createBatch(syspermissionMapping.toDomain(syspermissiondtos)); syspermissionService.createBatch(syspermissionMapping.toDomain(syspermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"SysPermission" }, notes = "CheckKey") @ApiOperation(value = "检查权限/资源", tags = {"权限/资源" }, notes = "检查权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysPermissionDTO syspermissiondto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysPermissionDTO syspermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.checkKey(syspermissionMapping.toDomain(syspermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(syspermissionService.checkKey(syspermissionMapping.toDomain(syspermissiondto)));
} }
@ApiOperation(value = "Get", tags = {"SysPermission" }, notes = "Get") @ApiOperation(value = "获取权限/资源", tags = {"权限/资源" }, notes = "获取权限/资源")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}") @RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}")
public ResponseEntity<SysPermissionDTO> get(@PathVariable("syspermission_id") String syspermission_id) { public ResponseEntity<SysPermissionDTO> get(@PathVariable("syspermission_id") String syspermission_id) {
SysPermission domain = syspermissionService.get(syspermission_id); SysPermission domain = syspermissionService.get(syspermission_id);
...@@ -128,7 +128,7 @@ public class SysPermissionResource { ...@@ -128,7 +128,7 @@ public class SysPermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysPermission" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"权限/资源" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/syspermissions/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/syspermissions/fetchdefault")
public ResponseEntity<List<SysPermissionDTO>> fetchDefault(SysPermissionSearchContext context) { public ResponseEntity<List<SysPermissionDTO>> fetchDefault(SysPermissionSearchContext context) {
Page<SysPermission> domains = syspermissionService.searchDefault(context) ; Page<SysPermission> domains = syspermissionService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class SysPermissionResource { ...@@ -140,7 +140,7 @@ public class SysPermissionResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysPermission" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"权限/资源" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/syspermissions/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/syspermissions/searchdefault")
public ResponseEntity<Page<SysPermissionDTO>> searchDefault(@RequestBody SysPermissionSearchContext context) { public ResponseEntity<Page<SysPermissionDTO>> searchDefault(@RequestBody SysPermissionSearchContext context) {
Page<SysPermission> domains = syspermissionService.searchDefault(context) ; Page<SysPermission> domains = syspermissionService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRolePermissionService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRolePermissionService;
import cn.ibizlab.core.uaa.filter.SysRolePermissionSearchContext; import cn.ibizlab.core.uaa.filter.SysRolePermissionSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysRolePermission" }) @Api(tags = {"角色权限关系" })
@RestController("api-sysrolepermission") @RestController("api-sysrolepermission")
@RequestMapping("") @RequestMapping("")
public class SysRolePermissionResource { public class SysRolePermissionResource {
...@@ -46,7 +46,7 @@ public class SysRolePermissionResource { ...@@ -46,7 +46,7 @@ public class SysRolePermissionResource {
@Lazy @Lazy
public SysRolePermissionMapping sysrolepermissionMapping; public SysRolePermissionMapping sysrolepermissionMapping;
@ApiOperation(value = "Get", tags = {"SysRolePermission" }, notes = "Get") @ApiOperation(value = "获取角色权限关系", tags = {"角色权限关系" }, notes = "获取角色权限关系")
@RequestMapping(method = RequestMethod.GET, value = "/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> get(@PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<SysRolePermissionDTO> get(@PathVariable("sysrolepermission_id") String sysrolepermission_id) {
SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id); SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id);
...@@ -54,27 +54,27 @@ public class SysRolePermissionResource { ...@@ -54,27 +54,27 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Remove", tags = {"SysRolePermission" }, notes = "Remove") @ApiOperation(value = "删除角色权限关系", tags = {"角色权限关系" }, notes = "删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<Boolean> remove(@PathVariable("sysrolepermission_id") String sysrolepermission_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id)); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysRolePermission" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除角色权限关系", tags = {"角色权限关系" }, notes = "批量删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysrolepermissions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysrolepermissionService.removeBatch(ids); sysrolepermissionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"SysRolePermission" }, notes = "GetDraft") @ApiOperation(value = "获取角色权限关系草稿", tags = {"角色权限关系" }, notes = "获取角色权限关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysrolepermissions/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysrolepermissions/getdraft")
public ResponseEntity<SysRolePermissionDTO> getDraft() { public ResponseEntity<SysRolePermissionDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(new SysRolePermission()))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(new SysRolePermission())));
} }
@ApiOperation(value = "Create", tags = {"SysRolePermission" }, notes = "Create") @ApiOperation(value = "新建角色权限关系", tags = {"角色权限关系" }, notes = "新建角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions") @RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions")
public ResponseEntity<SysRolePermissionDTO> create(@RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> create(@RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -84,33 +84,33 @@ public class SysRolePermissionResource { ...@@ -84,33 +84,33 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysRolePermission" }, notes = "createBatch") @ApiOperation(value = "批量新建角色权限关系", tags = {"角色权限关系" }, notes = "批量新建角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
sysrolepermissionService.createBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos)); sysrolepermissionService.createBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"SysRolePermission" }, notes = "CheckKey") @ApiOperation(value = "检查角色权限关系", tags = {"角色权限关系" }, notes = "检查角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysRolePermissionDTO sysrolepermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto)));
} }
@ApiOperation(value = "Save", tags = {"SysRolePermission" }, notes = "Save") @ApiOperation(value = "保存角色权限关系", tags = {"角色权限关系" }, notes = "保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/save") @RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/save")
public ResponseEntity<Boolean> save(@RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> save(@RequestBody SysRolePermissionDTO sysrolepermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(sysrolepermissionMapping.toDomain(sysrolepermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(sysrolepermissionMapping.toDomain(sysrolepermissiondto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysRolePermission" }, notes = "SaveBatch") @ApiOperation(value = "批量保存角色权限关系", tags = {"角色权限关系" }, notes = "批量保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysrolepermissions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
sysrolepermissionService.saveBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos)); sysrolepermissionService.saveBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"SysRolePermission" }, notes = "Update") @ApiOperation(value = "更新角色权限关系", tags = {"角色权限关系" }, notes = "更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> update(@PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> update(@PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -121,14 +121,14 @@ public class SysRolePermissionResource { ...@@ -121,14 +121,14 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysRolePermission" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新角色权限关系", tags = {"角色权限关系" }, notes = "批量更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysrolepermissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
sysrolepermissionService.updateBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos)); sysrolepermissionService.updateBatch(sysrolepermissionMapping.toDomain(sysrolepermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysRolePermission" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"角色权限关系" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysrolepermissions/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysrolepermissions/fetchdefault")
public ResponseEntity<List<SysRolePermissionDTO>> fetchDefault(SysRolePermissionSearchContext context) { public ResponseEntity<List<SysRolePermissionDTO>> fetchDefault(SysRolePermissionSearchContext context) {
Page<SysRolePermission> domains = sysrolepermissionService.searchDefault(context) ; Page<SysRolePermission> domains = sysrolepermissionService.searchDefault(context) ;
...@@ -140,14 +140,14 @@ public class SysRolePermissionResource { ...@@ -140,14 +140,14 @@ public class SysRolePermissionResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysRolePermission" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"角色权限关系" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysrolepermissions/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysrolepermissions/searchdefault")
public ResponseEntity<Page<SysRolePermissionDTO>> searchDefault(@RequestBody SysRolePermissionSearchContext context) { public ResponseEntity<Page<SysRolePermissionDTO>> searchDefault(@RequestBody SysRolePermissionSearchContext context) {
Page<SysRolePermission> domains = sysrolepermissionService.searchDefault(context) ; Page<SysRolePermission> domains = sysrolepermissionService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "GetBySysPermission", tags = {"SysRolePermission" }, notes = "GetBySysPermission") @ApiOperation(value = "根据权限/资源获取角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源获取角色权限关系")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> getBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<SysRolePermissionDTO> getBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) {
SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id); SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id);
...@@ -155,21 +155,21 @@ public class SysRolePermissionResource { ...@@ -155,21 +155,21 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "RemoveBySysPermission", tags = {"SysRolePermission" }, notes = "RemoveBySysPermission") @ApiOperation(value = "根据权限/资源删除角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<Boolean> removeBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<Boolean> removeBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id)); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id));
} }
@ApiOperation(value = "RemoveBatchBySysPermission", tags = {"SysRolePermission" }, notes = "RemoveBatchBySysPermission") @ApiOperation(value = "根据权限/资源批量删除角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源批量删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> removeBatchBySysPermission(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchBySysPermission(@RequestBody List<String> ids) {
sysrolepermissionService.removeBatch(ids); sysrolepermissionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftBySysPermission", tags = {"SysRolePermission" }, notes = "GetDraftBySysPermission") @ApiOperation(value = "根据权限/资源获取角色权限关系草稿", tags = {"角色权限关系" }, notes = "根据权限/资源获取角色权限关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}/sysrolepermissions/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}/sysrolepermissions/getdraft")
public ResponseEntity<SysRolePermissionDTO> getDraftBySysPermission(@PathVariable("syspermission_id") String syspermission_id) { public ResponseEntity<SysRolePermissionDTO> getDraftBySysPermission(@PathVariable("syspermission_id") String syspermission_id) {
SysRolePermission domain = new SysRolePermission(); SysRolePermission domain = new SysRolePermission();
...@@ -177,7 +177,7 @@ public class SysRolePermissionResource { ...@@ -177,7 +177,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(domain)));
} }
@ApiOperation(value = "CreateBySysPermission", tags = {"SysRolePermission" }, notes = "CreateBySysPermission") @ApiOperation(value = "根据权限/资源建立角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源建立角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions")
public ResponseEntity<SysRolePermissionDTO> createBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> createBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -188,7 +188,7 @@ public class SysRolePermissionResource { ...@@ -188,7 +188,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchBySysPermission", tags = {"SysRolePermission" }, notes = "createBatchBySysPermission") @ApiOperation(value = "根据权限/资源批量建立角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源批量建立角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> createBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> createBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -199,13 +199,13 @@ public class SysRolePermissionResource { ...@@ -199,13 +199,13 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyBySysPermission", tags = {"SysRolePermission" }, notes = "CheckKeyBySysPermission") @ApiOperation(value = "根据权限/资源检查角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源检查角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/checkkey")
public ResponseEntity<Boolean> checkKeyBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> checkKeyBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto)));
} }
@ApiOperation(value = "SaveBySysPermission", tags = {"SysRolePermission" }, notes = "SaveBySysPermission") @ApiOperation(value = "根据权限/资源保存角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/save") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/save")
public ResponseEntity<Boolean> saveBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> saveBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
SysRolePermission domain = sysrolepermissionMapping.toDomain(sysrolepermissiondto); SysRolePermission domain = sysrolepermissionMapping.toDomain(sysrolepermissiondto);
...@@ -213,7 +213,7 @@ public class SysRolePermissionResource { ...@@ -213,7 +213,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(domain));
} }
@ApiOperation(value = "SaveBatchBySysPermission", tags = {"SysRolePermission" }, notes = "SaveBatchBySysPermission") @ApiOperation(value = "根据权限/资源批量保存角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源批量保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/syspermissions/{syspermission_id}/sysrolepermissions/savebatch")
public ResponseEntity<Boolean> saveBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> saveBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -224,7 +224,7 @@ public class SysRolePermissionResource { ...@@ -224,7 +224,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "UpdateBySysPermission", tags = {"SysRolePermission" }, notes = "UpdateBySysPermission") @ApiOperation(value = "根据权限/资源更新角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> updateBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> updateBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -236,7 +236,7 @@ public class SysRolePermissionResource { ...@@ -236,7 +236,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchBySysPermission", tags = {"SysRolePermission" }, notes = "UpdateBatchBySysPermission") @ApiOperation(value = "根据权限/资源批量更新角色权限关系", tags = {"角色权限关系" }, notes = "根据权限/资源批量更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.PUT, value = "/syspermissions/{syspermission_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> updateBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> updateBatchBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -247,7 +247,7 @@ public class SysRolePermissionResource { ...@@ -247,7 +247,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTBySysPermission", tags = {"SysRolePermission" } ,notes = "fetchDEFAULTBySysPermission") @ApiOperation(value = "根据权限/资源获取DEFAULT", tags = {"角色权限关系" } ,notes = "根据权限/资源获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/syspermissions/{syspermission_id}/sysrolepermissions/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/syspermissions/{syspermission_id}/sysrolepermissions/fetchdefault")
public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionDefaultBySysPermission(@PathVariable("syspermission_id") String syspermission_id,SysRolePermissionSearchContext context) { public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionDefaultBySysPermission(@PathVariable("syspermission_id") String syspermission_id,SysRolePermissionSearchContext context) {
context.setN_sys_permissionid_eq(syspermission_id); context.setN_sys_permissionid_eq(syspermission_id);
...@@ -260,7 +260,7 @@ public class SysRolePermissionResource { ...@@ -260,7 +260,7 @@ public class SysRolePermissionResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTBySysPermission", tags = {"SysRolePermission" } ,notes = "searchDEFAULTBySysPermission") @ApiOperation(value = "根据权限/资源查询DEFAULT", tags = {"角色权限关系" } ,notes = "根据权限/资源查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/syspermissions/{syspermission_id}/sysrolepermissions/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/syspermissions/{syspermission_id}/sysrolepermissions/searchdefault")
public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionDefaultBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionSearchContext context) { public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionDefaultBySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionSearchContext context) {
context.setN_sys_permissionid_eq(syspermission_id); context.setN_sys_permissionid_eq(syspermission_id);
...@@ -268,7 +268,7 @@ public class SysRolePermissionResource { ...@@ -268,7 +268,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "GetBySysRole", tags = {"SysRolePermission" }, notes = "GetBySysRole") @ApiOperation(value = "根据系统角色获取角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色获取角色权限关系")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> getBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<SysRolePermissionDTO> getBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) {
SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id); SysRolePermission domain = sysrolepermissionService.get(sysrolepermission_id);
...@@ -276,21 +276,21 @@ public class SysRolePermissionResource { ...@@ -276,21 +276,21 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "RemoveBySysRole", tags = {"SysRolePermission" }, notes = "RemoveBySysRole") @ApiOperation(value = "根据系统角色删除角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<Boolean> removeBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) { public ResponseEntity<Boolean> removeBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id)); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.remove(sysrolepermission_id));
} }
@ApiOperation(value = "RemoveBatchBySysRole", tags = {"SysRolePermission" }, notes = "RemoveBatchBySysRole") @ApiOperation(value = "根据系统角色批量删除角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色批量删除角色权限关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> removeBatchBySysRole(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchBySysRole(@RequestBody List<String> ids) {
sysrolepermissionService.removeBatch(ids); sysrolepermissionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftBySysRole", tags = {"SysRolePermission" }, notes = "GetDraftBySysRole") @ApiOperation(value = "根据系统角色获取角色权限关系草稿", tags = {"角色权限关系" }, notes = "根据系统角色获取角色权限关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysrolepermissions/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysrolepermissions/getdraft")
public ResponseEntity<SysRolePermissionDTO> getDraftBySysRole(@PathVariable("sysrole_id") String sysrole_id) { public ResponseEntity<SysRolePermissionDTO> getDraftBySysRole(@PathVariable("sysrole_id") String sysrole_id) {
SysRolePermission domain = new SysRolePermission(); SysRolePermission domain = new SysRolePermission();
...@@ -298,7 +298,7 @@ public class SysRolePermissionResource { ...@@ -298,7 +298,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionMapping.toDto(sysrolepermissionService.getDraft(domain)));
} }
@ApiOperation(value = "CreateBySysRole", tags = {"SysRolePermission" }, notes = "CreateBySysRole") @ApiOperation(value = "根据系统角色建立角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色建立角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions")
public ResponseEntity<SysRolePermissionDTO> createBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> createBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -309,7 +309,7 @@ public class SysRolePermissionResource { ...@@ -309,7 +309,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchBySysRole", tags = {"SysRolePermission" }, notes = "createBatchBySysRole") @ApiOperation(value = "根据系统角色批量建立角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色批量建立角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> createBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> createBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -320,13 +320,13 @@ public class SysRolePermissionResource { ...@@ -320,13 +320,13 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyBySysRole", tags = {"SysRolePermission" }, notes = "CheckKeyBySysRole") @ApiOperation(value = "根据系统角色检查角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色检查角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/checkkey")
public ResponseEntity<Boolean> checkKeyBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> checkKeyBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto))); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.checkKey(sysrolepermissionMapping.toDomain(sysrolepermissiondto)));
} }
@ApiOperation(value = "SaveBySysRole", tags = {"SysRolePermission" }, notes = "SaveBySysRole") @ApiOperation(value = "根据系统角色保存角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/save") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/save")
public ResponseEntity<Boolean> saveBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<Boolean> saveBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
SysRolePermission domain = sysrolepermissionMapping.toDomain(sysrolepermissiondto); SysRolePermission domain = sysrolepermissionMapping.toDomain(sysrolepermissiondto);
...@@ -334,7 +334,7 @@ public class SysRolePermissionResource { ...@@ -334,7 +334,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(sysrolepermissionService.save(domain));
} }
@ApiOperation(value = "SaveBatchBySysRole", tags = {"SysRolePermission" }, notes = "SaveBatchBySysRole") @ApiOperation(value = "根据系统角色批量保存角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色批量保存角色权限关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysrolepermissions/savebatch")
public ResponseEntity<Boolean> saveBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> saveBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -345,7 +345,7 @@ public class SysRolePermissionResource { ...@@ -345,7 +345,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "UpdateBySysRole", tags = {"SysRolePermission" }, notes = "UpdateBySysRole") @ApiOperation(value = "根据系统角色更新角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}")
public ResponseEntity<SysRolePermissionDTO> updateBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) { public ResponseEntity<SysRolePermissionDTO> updateBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysrolepermission_id") String sysrolepermission_id, @RequestBody SysRolePermissionDTO sysrolepermissiondto) {
...@@ -357,7 +357,7 @@ public class SysRolePermissionResource { ...@@ -357,7 +357,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchBySysRole", tags = {"SysRolePermission" }, notes = "UpdateBatchBySysRole") @ApiOperation(value = "根据系统角色批量更新角色权限关系", tags = {"角色权限关系" }, notes = "根据系统角色批量更新角色权限关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysrolepermissions/batch")
public ResponseEntity<Boolean> updateBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) { public ResponseEntity<Boolean> updateBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysRolePermissionDTO> sysrolepermissiondtos) {
List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos); List<SysRolePermission> domainlist=sysrolepermissionMapping.toDomain(sysrolepermissiondtos);
...@@ -368,7 +368,7 @@ public class SysRolePermissionResource { ...@@ -368,7 +368,7 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTBySysRole", tags = {"SysRolePermission" } ,notes = "fetchDEFAULTBySysRole") @ApiOperation(value = "根据系统角色获取DEFAULT", tags = {"角色权限关系" } ,notes = "根据系统角色获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysroles/{sysrole_id}/sysrolepermissions/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysroles/{sysrole_id}/sysrolepermissions/fetchdefault")
public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id,SysRolePermissionSearchContext context) { public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id,SysRolePermissionSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id); context.setN_sys_roleid_eq(sysrole_id);
...@@ -381,7 +381,7 @@ public class SysRolePermissionResource { ...@@ -381,7 +381,7 @@ public class SysRolePermissionResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTBySysRole", tags = {"SysRolePermission" } ,notes = "searchDEFAULTBySysRole") @ApiOperation(value = "根据系统角色查询DEFAULT", tags = {"角色权限关系" } ,notes = "根据系统角色查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysroles/{sysrole_id}/sysrolepermissions/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysroles/{sysrole_id}/sysrolepermissions/searchdefault")
public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionSearchContext context) { public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id); context.setN_sys_roleid_eq(sysrole_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRoleService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRoleService;
import cn.ibizlab.core.uaa.filter.SysRoleSearchContext; import cn.ibizlab.core.uaa.filter.SysRoleSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysRole" }) @Api(tags = {"系统角色" })
@RestController("api-sysrole") @RestController("api-sysrole")
@RequestMapping("") @RequestMapping("")
public class SysRoleResource { public class SysRoleResource {
...@@ -46,20 +46,20 @@ public class SysRoleResource { ...@@ -46,20 +46,20 @@ public class SysRoleResource {
@Lazy @Lazy
public SysRoleMapping sysroleMapping; public SysRoleMapping sysroleMapping;
@ApiOperation(value = "Save", tags = {"SysRole" }, notes = "Save") @ApiOperation(value = "保存系统角色", tags = {"系统角色" }, notes = "保存系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/save") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/save")
public ResponseEntity<Boolean> save(@RequestBody SysRoleDTO sysroledto) { public ResponseEntity<Boolean> save(@RequestBody SysRoleDTO sysroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysroleService.save(sysroleMapping.toDomain(sysroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysroleService.save(sysroleMapping.toDomain(sysroledto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysRole" }, notes = "SaveBatch") @ApiOperation(value = "批量保存系统角色", tags = {"系统角色" }, notes = "批量保存系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRoleDTO> sysroledtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.saveBatch(sysroleMapping.toDomain(sysroledtos)); sysroleService.saveBatch(sysroleMapping.toDomain(sysroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"SysRole" }, notes = "Update") @ApiOperation(value = "更新系统角色", tags = {"系统角色" }, notes = "更新系统角色")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}")
public ResponseEntity<SysRoleDTO> update(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRoleDTO sysroledto) { public ResponseEntity<SysRoleDTO> update(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRoleDTO sysroledto) {
...@@ -70,14 +70,14 @@ public class SysRoleResource { ...@@ -70,14 +70,14 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysRole" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新系统角色", tags = {"系统角色" }, notes = "批量更新系统角色")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRoleDTO> sysroledtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.updateBatch(sysroleMapping.toDomain(sysroledtos)); sysroleService.updateBatch(sysroleMapping.toDomain(sysroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"SysRole" }, notes = "Create") @ApiOperation(value = "新建系统角色", tags = {"系统角色" }, notes = "新建系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles") @RequestMapping(method = RequestMethod.POST, value = "/sysroles")
public ResponseEntity<SysRoleDTO> create(@RequestBody SysRoleDTO sysroledto) { public ResponseEntity<SysRoleDTO> create(@RequestBody SysRoleDTO sysroledto) {
...@@ -87,14 +87,14 @@ public class SysRoleResource { ...@@ -87,14 +87,14 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysRole" }, notes = "createBatch") @ApiOperation(value = "批量新建系统角色", tags = {"系统角色" }, notes = "批量新建系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRoleDTO> sysroledtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.createBatch(sysroleMapping.toDomain(sysroledtos)); sysroleService.createBatch(sysroleMapping.toDomain(sysroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"SysRole" }, notes = "Get") @ApiOperation(value = "获取系统角色", tags = {"系统角色" }, notes = "获取系统角色")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}")
public ResponseEntity<SysRoleDTO> get(@PathVariable("sysrole_id") String sysrole_id) { public ResponseEntity<SysRoleDTO> get(@PathVariable("sysrole_id") String sysrole_id) {
SysRole domain = sysroleService.get(sysrole_id); SysRole domain = sysroleService.get(sysrole_id);
...@@ -102,33 +102,33 @@ public class SysRoleResource { ...@@ -102,33 +102,33 @@ public class SysRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Remove", tags = {"SysRole" }, notes = "Remove") @ApiOperation(value = "删除系统角色", tags = {"系统角色" }, notes = "删除系统角色")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysrole_id") String sysrole_id) { public ResponseEntity<Boolean> remove(@PathVariable("sysrole_id") String sysrole_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysroleService.remove(sysrole_id)); return ResponseEntity.status(HttpStatus.OK).body(sysroleService.remove(sysrole_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysRole" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除系统角色", tags = {"系统角色" }, notes = "批量删除系统角色")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysroleService.removeBatch(ids); sysroleService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"SysRole" }, notes = "GetDraft") @ApiOperation(value = "获取系统角色草稿", tags = {"系统角色" }, notes = "获取系统角色草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/getdraft")
public ResponseEntity<SysRoleDTO> getDraft() { public ResponseEntity<SysRoleDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysroleMapping.toDto(sysroleService.getDraft(new SysRole()))); return ResponseEntity.status(HttpStatus.OK).body(sysroleMapping.toDto(sysroleService.getDraft(new SysRole())));
} }
@ApiOperation(value = "CheckKey", tags = {"SysRole" }, notes = "CheckKey") @ApiOperation(value = "检查系统角色", tags = {"系统角色" }, notes = "检查系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysRoleDTO sysroledto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysRoleDTO sysroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysroleService.checkKey(sysroleMapping.toDomain(sysroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysroleService.checkKey(sysroleMapping.toDomain(sysroledto)));
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysRole" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"系统角色" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysroles/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysroles/fetchdefault")
public ResponseEntity<List<SysRoleDTO>> fetchDefault(SysRoleSearchContext context) { public ResponseEntity<List<SysRoleDTO>> fetchDefault(SysRoleSearchContext context) {
Page<SysRole> domains = sysroleService.searchDefault(context) ; Page<SysRole> domains = sysroleService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class SysRoleResource { ...@@ -140,7 +140,7 @@ public class SysRoleResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysRole" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"系统角色" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysroles/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysroles/searchdefault")
public ResponseEntity<Page<SysRoleDTO>> searchDefault(@RequestBody SysRoleSearchContext context) { public ResponseEntity<Page<SysRoleDTO>> searchDefault(@RequestBody SysRoleSearchContext context) {
Page<SysRole> domains = sysroleService.searchDefault(context) ; Page<SysRole> domains = sysroleService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserService;
import cn.ibizlab.core.uaa.filter.SysUserSearchContext; import cn.ibizlab.core.uaa.filter.SysUserSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysUser" }) @Api(tags = {"系统用户" })
@RestController("api-sysuser") @RestController("api-sysuser")
@RequestMapping("") @RequestMapping("")
public class SysUserResource { public class SysUserResource {
...@@ -46,21 +46,21 @@ public class SysUserResource { ...@@ -46,21 +46,21 @@ public class SysUserResource {
@Lazy @Lazy
public SysUserMapping sysuserMapping; public SysUserMapping sysuserMapping;
@ApiOperation(value = "Remove", tags = {"SysUser" }, notes = "Remove") @ApiOperation(value = "删除系统用户", tags = {"系统用户" }, notes = "删除系统用户")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysuser_id") String sysuser_id) { public ResponseEntity<Boolean> remove(@PathVariable("sysuser_id") String sysuser_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserService.remove(sysuser_id)); return ResponseEntity.status(HttpStatus.OK).body(sysuserService.remove(sysuser_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysUser" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除系统用户", tags = {"系统用户" }, notes = "批量删除系统用户")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysuserService.removeBatch(ids); sysuserService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"SysUser" }, notes = "Update") @ApiOperation(value = "更新系统用户", tags = {"系统用户" }, notes = "更新系统用户")
@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}")
public ResponseEntity<SysUserDTO> update(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserDTO sysuserdto) { public ResponseEntity<SysUserDTO> update(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserDTO sysuserdto) {
...@@ -71,20 +71,20 @@ public class SysUserResource { ...@@ -71,20 +71,20 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysUser" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新系统用户", tags = {"系统用户" }, notes = "批量更新系统用户")
@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysusers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserDTO> sysuserdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.updateBatch(sysuserMapping.toDomain(sysuserdtos)); sysuserService.updateBatch(sysuserMapping.toDomain(sysuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"SysUser" }, notes = "CheckKey") @ApiOperation(value = "检查系统用户", tags = {"系统用户" }, notes = "检查系统用户")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysUserDTO sysuserdto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysUserDTO sysuserdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserService.checkKey(sysuserMapping.toDomain(sysuserdto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserService.checkKey(sysuserMapping.toDomain(sysuserdto)));
} }
@ApiOperation(value = "Get", tags = {"SysUser" }, notes = "Get") @ApiOperation(value = "获取系统用户", tags = {"系统用户" }, notes = "获取系统用户")
@RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}")
public ResponseEntity<SysUserDTO> get(@PathVariable("sysuser_id") String sysuser_id) { public ResponseEntity<SysUserDTO> get(@PathVariable("sysuser_id") String sysuser_id) {
SysUser domain = sysuserService.get(sysuser_id); SysUser domain = sysuserService.get(sysuser_id);
...@@ -92,26 +92,26 @@ public class SysUserResource { ...@@ -92,26 +92,26 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Save", tags = {"SysUser" }, notes = "Save") @ApiOperation(value = "保存系统用户", tags = {"系统用户" }, notes = "保存系统用户")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/save") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/save")
public ResponseEntity<Boolean> save(@RequestBody SysUserDTO sysuserdto) { public ResponseEntity<Boolean> save(@RequestBody SysUserDTO sysuserdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserService.save(sysuserMapping.toDomain(sysuserdto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserService.save(sysuserMapping.toDomain(sysuserdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysUser" }, notes = "SaveBatch") @ApiOperation(value = "批量保存系统用户", tags = {"系统用户" }, notes = "批量保存系统用户")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserDTO> sysuserdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.saveBatch(sysuserMapping.toDomain(sysuserdtos)); sysuserService.saveBatch(sysuserMapping.toDomain(sysuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"SysUser" }, notes = "GetDraft") @ApiOperation(value = "获取系统用户草稿", tags = {"系统用户" }, notes = "获取系统用户草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysusers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysusers/getdraft")
public ResponseEntity<SysUserDTO> getDraft() { public ResponseEntity<SysUserDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysuserMapping.toDto(sysuserService.getDraft(new SysUser()))); return ResponseEntity.status(HttpStatus.OK).body(sysuserMapping.toDto(sysuserService.getDraft(new SysUser())));
} }
@ApiOperation(value = "Create", tags = {"SysUser" }, notes = "Create") @ApiOperation(value = "新建系统用户", tags = {"系统用户" }, notes = "新建系统用户")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers") @RequestMapping(method = RequestMethod.POST, value = "/sysusers")
public ResponseEntity<SysUserDTO> create(@RequestBody SysUserDTO sysuserdto) { public ResponseEntity<SysUserDTO> create(@RequestBody SysUserDTO sysuserdto) {
...@@ -121,14 +121,14 @@ public class SysUserResource { ...@@ -121,14 +121,14 @@ public class SysUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysUser" }, notes = "createBatch") @ApiOperation(value = "批量新建系统用户", tags = {"系统用户" }, notes = "批量新建系统用户")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserDTO> sysuserdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.createBatch(sysuserMapping.toDomain(sysuserdtos)); sysuserService.createBatch(sysuserMapping.toDomain(sysuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysUser" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"系统用户" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysusers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysusers/fetchdefault")
public ResponseEntity<List<SysUserDTO>> fetchDefault(SysUserSearchContext context) { public ResponseEntity<List<SysUserDTO>> fetchDefault(SysUserSearchContext context) {
Page<SysUser> domains = sysuserService.searchDefault(context) ; Page<SysUser> domains = sysuserService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class SysUserResource { ...@@ -140,7 +140,7 @@ public class SysUserResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysUser" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"系统用户" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysusers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysusers/searchdefault")
public ResponseEntity<Page<SysUserDTO>> searchDefault(@RequestBody SysUserSearchContext context) { public ResponseEntity<Page<SysUserDTO>> searchDefault(@RequestBody SysUserSearchContext context) {
Page<SysUser> domains = sysuserService.searchDefault(context) ; Page<SysUser> domains = sysuserService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserRoleService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserRoleService;
import cn.ibizlab.core.uaa.filter.SysUserRoleSearchContext; import cn.ibizlab.core.uaa.filter.SysUserRoleSearchContext;
@Slf4j @Slf4j
@Api(tags = {"SysUserRole" }) @Api(tags = {"用户角色关系" })
@RestController("api-sysuserrole") @RestController("api-sysuserrole")
@RequestMapping("") @RequestMapping("")
public class SysUserRoleResource { public class SysUserRoleResource {
...@@ -46,19 +46,19 @@ public class SysUserRoleResource { ...@@ -46,19 +46,19 @@ public class SysUserRoleResource {
@Lazy @Lazy
public SysUserRoleMapping sysuserroleMapping; public SysUserRoleMapping sysuserroleMapping;
@ApiOperation(value = "CheckKey", tags = {"SysUserRole" }, notes = "CheckKey") @ApiOperation(value = "检查用户角色关系", tags = {"用户角色关系" }, notes = "检查用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> checkKey(@RequestBody SysUserRoleDTO sysuserroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto)));
} }
@ApiOperation(value = "GetDraft", tags = {"SysUserRole" }, notes = "GetDraft") @ApiOperation(value = "获取用户角色关系草稿", tags = {"用户角色关系" }, notes = "获取用户角色关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysuserroles/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysuserroles/getdraft")
public ResponseEntity<SysUserRoleDTO> getDraft() { public ResponseEntity<SysUserRoleDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(new SysUserRole()))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(new SysUserRole())));
} }
@ApiOperation(value = "Update", tags = {"SysUserRole" }, notes = "Update") @ApiOperation(value = "更新用户角色关系", tags = {"用户角色关系" }, notes = "更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> update(@PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> update(@PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -69,28 +69,28 @@ public class SysUserRoleResource { ...@@ -69,28 +69,28 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"SysUserRole" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新用户角色关系", tags = {"用户角色关系" }, notes = "批量更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysuserroles/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysuserroles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) {
sysuserroleService.updateBatch(sysuserroleMapping.toDomain(sysuserroledtos)); sysuserroleService.updateBatch(sysuserroleMapping.toDomain(sysuserroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Remove", tags = {"SysUserRole" }, notes = "Remove") @ApiOperation(value = "删除用户角色关系", tags = {"用户角色关系" }, notes = "删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysuserroles/{sysuserrole_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<Boolean> remove(@PathVariable("sysuserrole_id") String sysuserrole_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id)); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"SysUserRole" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除用户角色关系", tags = {"用户角色关系" }, notes = "批量删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysuserroles/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysuserroles/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysuserroleService.removeBatch(ids); sysuserroleService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"SysUserRole" }, notes = "Create") @ApiOperation(value = "新建用户角色关系", tags = {"用户角色关系" }, notes = "新建用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles") @RequestMapping(method = RequestMethod.POST, value = "/sysuserroles")
public ResponseEntity<SysUserRoleDTO> create(@RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> create(@RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -100,14 +100,14 @@ public class SysUserRoleResource { ...@@ -100,14 +100,14 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"SysUserRole" }, notes = "createBatch") @ApiOperation(value = "批量新建用户角色关系", tags = {"用户角色关系" }, notes = "批量新建用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) {
sysuserroleService.createBatch(sysuserroleMapping.toDomain(sysuserroledtos)); sysuserroleService.createBatch(sysuserroleMapping.toDomain(sysuserroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"SysUserRole" }, notes = "Get") @ApiOperation(value = "获取用户角色关系", tags = {"用户角色关系" }, notes = "获取用户角色关系")
@RequestMapping(method = RequestMethod.GET, value = "/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> get(@PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<SysUserRoleDTO> get(@PathVariable("sysuserrole_id") String sysuserrole_id) {
SysUserRole domain = sysuserroleService.get(sysuserrole_id); SysUserRole domain = sysuserroleService.get(sysuserrole_id);
...@@ -115,20 +115,20 @@ public class SysUserRoleResource { ...@@ -115,20 +115,20 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Save", tags = {"SysUserRole" }, notes = "Save") @ApiOperation(value = "保存用户角色关系", tags = {"用户角色关系" }, notes = "保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/save") @RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/save")
public ResponseEntity<Boolean> save(@RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> save(@RequestBody SysUserRoleDTO sysuserroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(sysuserroleMapping.toDomain(sysuserroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(sysuserroleMapping.toDomain(sysuserroledto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"SysUserRole" }, notes = "SaveBatch") @ApiOperation(value = "批量保存用户角色关系", tags = {"用户角色关系" }, notes = "批量保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysuserroles/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserRoleDTO> sysuserroledtos) {
sysuserroleService.saveBatch(sysuserroleMapping.toDomain(sysuserroledtos)); sysuserroleService.saveBatch(sysuserroleMapping.toDomain(sysuserroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"SysUserRole" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"用户角色关系" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysuserroles/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysuserroles/fetchdefault")
public ResponseEntity<List<SysUserRoleDTO>> fetchDefault(SysUserRoleSearchContext context) { public ResponseEntity<List<SysUserRoleDTO>> fetchDefault(SysUserRoleSearchContext context) {
Page<SysUserRole> domains = sysuserroleService.searchDefault(context) ; Page<SysUserRole> domains = sysuserroleService.searchDefault(context) ;
...@@ -140,20 +140,20 @@ public class SysUserRoleResource { ...@@ -140,20 +140,20 @@ public class SysUserRoleResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"SysUserRole" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"用户角色关系" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysuserroles/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysuserroles/searchdefault")
public ResponseEntity<Page<SysUserRoleDTO>> searchDefault(@RequestBody SysUserRoleSearchContext context) { public ResponseEntity<Page<SysUserRoleDTO>> searchDefault(@RequestBody SysUserRoleSearchContext context) {
Page<SysUserRole> domains = sysuserroleService.searchDefault(context) ; Page<SysUserRole> domains = sysuserroleService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysuserroleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(sysuserroleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "CheckKeyBySysRole", tags = {"SysUserRole" }, notes = "CheckKeyBySysRole") @ApiOperation(value = "根据系统角色检查用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色检查用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/checkkey")
public ResponseEntity<Boolean> checkKeyBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> checkKeyBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto)));
} }
@ApiOperation(value = "GetDraftBySysRole", tags = {"SysUserRole" }, notes = "GetDraftBySysRole") @ApiOperation(value = "根据系统角色获取用户角色关系草稿", tags = {"用户角色关系" }, notes = "根据系统角色获取用户角色关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysuserroles/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysuserroles/getdraft")
public ResponseEntity<SysUserRoleDTO> getDraftBySysRole(@PathVariable("sysrole_id") String sysrole_id) { public ResponseEntity<SysUserRoleDTO> getDraftBySysRole(@PathVariable("sysrole_id") String sysrole_id) {
SysUserRole domain = new SysUserRole(); SysUserRole domain = new SysUserRole();
...@@ -161,7 +161,7 @@ public class SysUserRoleResource { ...@@ -161,7 +161,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain)));
} }
@ApiOperation(value = "UpdateBySysRole", tags = {"SysUserRole" }, notes = "UpdateBySysRole") @ApiOperation(value = "根据系统角色更新用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> updateBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> updateBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -173,7 +173,7 @@ public class SysUserRoleResource { ...@@ -173,7 +173,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchBySysRole", tags = {"SysUserRole" }, notes = "UpdateBatchBySysRole") @ApiOperation(value = "根据系统角色批量更新用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色批量更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysroles/{sysrole_id}/sysuserroles/batch")
public ResponseEntity<Boolean> updateBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> updateBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -184,21 +184,21 @@ public class SysUserRoleResource { ...@@ -184,21 +184,21 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "RemoveBySysRole", tags = {"SysUserRole" }, notes = "RemoveBySysRole") @ApiOperation(value = "根据系统角色删除用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<Boolean> removeBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<Boolean> removeBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id)); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id));
} }
@ApiOperation(value = "RemoveBatchBySysRole", tags = {"SysUserRole" }, notes = "RemoveBatchBySysRole") @ApiOperation(value = "根据系统角色批量删除用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色批量删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysroles/{sysrole_id}/sysuserroles/batch")
public ResponseEntity<Boolean> removeBatchBySysRole(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchBySysRole(@RequestBody List<String> ids) {
sysuserroleService.removeBatch(ids); sysuserroleService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateBySysRole", tags = {"SysUserRole" }, notes = "CreateBySysRole") @ApiOperation(value = "根据系统角色建立用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色建立用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles")
public ResponseEntity<SysUserRoleDTO> createBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> createBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -209,7 +209,7 @@ public class SysUserRoleResource { ...@@ -209,7 +209,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchBySysRole", tags = {"SysUserRole" }, notes = "createBatchBySysRole") @ApiOperation(value = "根据系统角色批量建立用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色批量建立用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/batch")
public ResponseEntity<Boolean> createBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> createBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -220,7 +220,7 @@ public class SysUserRoleResource { ...@@ -220,7 +220,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetBySysRole", tags = {"SysUserRole" }, notes = "GetBySysRole") @ApiOperation(value = "根据系统角色获取用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色获取用户角色关系")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> getBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<SysUserRoleDTO> getBySysRole(@PathVariable("sysrole_id") String sysrole_id, @PathVariable("sysuserrole_id") String sysuserrole_id) {
SysUserRole domain = sysuserroleService.get(sysuserrole_id); SysUserRole domain = sysuserroleService.get(sysuserrole_id);
...@@ -228,7 +228,7 @@ public class SysUserRoleResource { ...@@ -228,7 +228,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "SaveBySysRole", tags = {"SysUserRole" }, notes = "SaveBySysRole") @ApiOperation(value = "根据系统角色保存用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/save") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/save")
public ResponseEntity<Boolean> saveBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> saveBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
SysUserRole domain = sysuserroleMapping.toDomain(sysuserroledto); SysUserRole domain = sysuserroleMapping.toDomain(sysuserroledto);
...@@ -236,7 +236,7 @@ public class SysUserRoleResource { ...@@ -236,7 +236,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(domain));
} }
@ApiOperation(value = "SaveBatchBySysRole", tags = {"SysUserRole" }, notes = "SaveBatchBySysRole") @ApiOperation(value = "根据系统角色批量保存用户角色关系", tags = {"用户角色关系" }, notes = "根据系统角色批量保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysroles/{sysrole_id}/sysuserroles/savebatch")
public ResponseEntity<Boolean> saveBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> saveBatchBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -247,7 +247,7 @@ public class SysUserRoleResource { ...@@ -247,7 +247,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTBySysRole", tags = {"SysUserRole" } ,notes = "fetchDEFAULTBySysRole") @ApiOperation(value = "根据系统角色获取DEFAULT", tags = {"用户角色关系" } ,notes = "根据系统角色获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysroles/{sysrole_id}/sysuserroles/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysroles/{sysrole_id}/sysuserroles/fetchdefault")
public ResponseEntity<List<SysUserRoleDTO>> fetchSysUserRoleDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id,SysUserRoleSearchContext context) { public ResponseEntity<List<SysUserRoleDTO>> fetchSysUserRoleDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id,SysUserRoleSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id); context.setN_sys_roleid_eq(sysrole_id);
...@@ -260,7 +260,7 @@ public class SysUserRoleResource { ...@@ -260,7 +260,7 @@ public class SysUserRoleResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTBySysRole", tags = {"SysUserRole" } ,notes = "searchDEFAULTBySysRole") @ApiOperation(value = "根据系统角色查询DEFAULT", tags = {"用户角色关系" } ,notes = "根据系统角色查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysroles/{sysrole_id}/sysuserroles/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysroles/{sysrole_id}/sysuserroles/searchdefault")
public ResponseEntity<Page<SysUserRoleDTO>> searchSysUserRoleDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleSearchContext context) { public ResponseEntity<Page<SysUserRoleDTO>> searchSysUserRoleDefaultBySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysUserRoleSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id); context.setN_sys_roleid_eq(sysrole_id);
...@@ -268,13 +268,13 @@ public class SysUserRoleResource { ...@@ -268,13 +268,13 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysuserroleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(sysuserroleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "CheckKeyBySysUser", tags = {"SysUserRole" }, notes = "CheckKeyBySysUser") @ApiOperation(value = "根据系统用户检查用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户检查用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/checkkey")
public ResponseEntity<Boolean> checkKeyBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> checkKeyBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.checkKey(sysuserroleMapping.toDomain(sysuserroledto)));
} }
@ApiOperation(value = "GetDraftBySysUser", tags = {"SysUserRole" }, notes = "GetDraftBySysUser") @ApiOperation(value = "根据系统用户获取用户角色关系草稿", tags = {"用户角色关系" }, notes = "根据系统用户获取用户角色关系草稿")
@RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}/sysuserroles/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}/sysuserroles/getdraft")
public ResponseEntity<SysUserRoleDTO> getDraftBySysUser(@PathVariable("sysuser_id") String sysuser_id) { public ResponseEntity<SysUserRoleDTO> getDraftBySysUser(@PathVariable("sysuser_id") String sysuser_id) {
SysUserRole domain = new SysUserRole(); SysUserRole domain = new SysUserRole();
...@@ -282,7 +282,7 @@ public class SysUserRoleResource { ...@@ -282,7 +282,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleMapping.toDto(sysuserroleService.getDraft(domain)));
} }
@ApiOperation(value = "UpdateBySysUser", tags = {"SysUserRole" }, notes = "UpdateBySysUser") @ApiOperation(value = "根据系统用户更新用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> updateBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> updateBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id, @RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -294,7 +294,7 @@ public class SysUserRoleResource { ...@@ -294,7 +294,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchBySysUser", tags = {"SysUserRole" }, notes = "UpdateBatchBySysUser") @ApiOperation(value = "根据系统用户批量更新用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户批量更新用户角色关系")
@RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.PUT, value = "/sysusers/{sysuser_id}/sysuserroles/batch")
public ResponseEntity<Boolean> updateBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> updateBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -305,21 +305,21 @@ public class SysUserRoleResource { ...@@ -305,21 +305,21 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "RemoveBySysUser", tags = {"SysUserRole" }, notes = "RemoveBySysUser") @ApiOperation(value = "根据系统用户删除用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<Boolean> removeBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<Boolean> removeBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id) {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id)); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.remove(sysuserrole_id));
} }
@ApiOperation(value = "RemoveBatchBySysUser", tags = {"SysUserRole" }, notes = "RemoveBatchBySysUser") @ApiOperation(value = "根据系统用户批量删除用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户批量删除用户角色关系")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}/sysuserroles/batch")
public ResponseEntity<Boolean> removeBatchBySysUser(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchBySysUser(@RequestBody List<String> ids) {
sysuserroleService.removeBatch(ids); sysuserroleService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateBySysUser", tags = {"SysUserRole" }, notes = "CreateBySysUser") @ApiOperation(value = "根据系统用户建立用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户建立用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles")
public ResponseEntity<SysUserRoleDTO> createBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<SysUserRoleDTO> createBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) {
...@@ -330,7 +330,7 @@ public class SysUserRoleResource { ...@@ -330,7 +330,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchBySysUser", tags = {"SysUserRole" }, notes = "createBatchBySysUser") @ApiOperation(value = "根据系统用户批量建立用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户批量建立用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/batch") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/batch")
public ResponseEntity<Boolean> createBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> createBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -341,7 +341,7 @@ public class SysUserRoleResource { ...@@ -341,7 +341,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetBySysUser", tags = {"SysUserRole" }, notes = "GetBySysUser") @ApiOperation(value = "根据系统用户获取用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户获取用户角色关系")
@RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}") @RequestMapping(method = RequestMethod.GET, value = "/sysusers/{sysuser_id}/sysuserroles/{sysuserrole_id}")
public ResponseEntity<SysUserRoleDTO> getBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id) { public ResponseEntity<SysUserRoleDTO> getBySysUser(@PathVariable("sysuser_id") String sysuser_id, @PathVariable("sysuserrole_id") String sysuserrole_id) {
SysUserRole domain = sysuserroleService.get(sysuserrole_id); SysUserRole domain = sysuserroleService.get(sysuserrole_id);
...@@ -349,7 +349,7 @@ public class SysUserRoleResource { ...@@ -349,7 +349,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "SaveBySysUser", tags = {"SysUserRole" }, notes = "SaveBySysUser") @ApiOperation(value = "根据系统用户保存用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/save") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/save")
public ResponseEntity<Boolean> saveBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) { public ResponseEntity<Boolean> saveBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleDTO sysuserroledto) {
SysUserRole domain = sysuserroleMapping.toDomain(sysuserroledto); SysUserRole domain = sysuserroleMapping.toDomain(sysuserroledto);
...@@ -357,7 +357,7 @@ public class SysUserRoleResource { ...@@ -357,7 +357,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(sysuserroleService.save(domain));
} }
@ApiOperation(value = "SaveBatchBySysUser", tags = {"SysUserRole" }, notes = "SaveBatchBySysUser") @ApiOperation(value = "根据系统用户批量保存用户角色关系", tags = {"用户角色关系" }, notes = "根据系统用户批量保存用户角色关系")
@RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/sysusers/{sysuser_id}/sysuserroles/savebatch")
public ResponseEntity<Boolean> saveBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) { public ResponseEntity<Boolean> saveBatchBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody List<SysUserRoleDTO> sysuserroledtos) {
List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos); List<SysUserRole> domainlist=sysuserroleMapping.toDomain(sysuserroledtos);
...@@ -368,7 +368,7 @@ public class SysUserRoleResource { ...@@ -368,7 +368,7 @@ public class SysUserRoleResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULTBySysUser", tags = {"SysUserRole" } ,notes = "fetchDEFAULTBySysUser") @ApiOperation(value = "根据系统用户获取DEFAULT", tags = {"用户角色关系" } ,notes = "根据系统用户获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysusers/{sysuser_id}/sysuserroles/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/sysusers/{sysuser_id}/sysuserroles/fetchdefault")
public ResponseEntity<List<SysUserRoleDTO>> fetchSysUserRoleDefaultBySysUser(@PathVariable("sysuser_id") String sysuser_id,SysUserRoleSearchContext context) { public ResponseEntity<List<SysUserRoleDTO>> fetchSysUserRoleDefaultBySysUser(@PathVariable("sysuser_id") String sysuser_id,SysUserRoleSearchContext context) {
context.setN_sys_userid_eq(sysuser_id); context.setN_sys_userid_eq(sysuser_id);
...@@ -381,7 +381,7 @@ public class SysUserRoleResource { ...@@ -381,7 +381,7 @@ public class SysUserRoleResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTBySysUser", tags = {"SysUserRole" } ,notes = "searchDEFAULTBySysUser") @ApiOperation(value = "根据系统用户查询DEFAULT", tags = {"用户角色关系" } ,notes = "根据系统用户查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysusers/{sysuser_id}/sysuserroles/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/sysusers/{sysuser_id}/sysuserroles/searchdefault")
public ResponseEntity<Page<SysUserRoleDTO>> searchSysUserRoleDefaultBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleSearchContext context) { public ResponseEntity<Page<SysUserRoleDTO>> searchSysUserRoleDefaultBySysUser(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserRoleSearchContext context) {
context.setN_sys_userid_eq(sysuser_id); context.setN_sys_userid_eq(sysuser_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFGroupService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFGroupService;
import cn.ibizlab.core.workflow.filter.WFGroupSearchContext; import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFGroup" }) @Api(tags = {"角色/用户组" })
@RestController("api-wfgroup") @RestController("api-wfgroup")
@RequestMapping("") @RequestMapping("")
public class WFGroupResource { public class WFGroupResource {
...@@ -46,34 +46,34 @@ public class WFGroupResource { ...@@ -46,34 +46,34 @@ public class WFGroupResource {
@Lazy @Lazy
public WFGroupMapping wfgroupMapping; public WFGroupMapping wfgroupMapping;
@ApiOperation(value = "Remove", tags = {"WFGroup" }, notes = "Remove") @ApiOperation(value = "删除角色/用户组", tags = {"角色/用户组" }, notes = "删除角色/用户组")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfgroup_id") String wfgroup_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfgroup_id") String wfgroup_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.remove(wfgroup_id)); return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.remove(wfgroup_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFGroup" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除角色/用户组", tags = {"角色/用户组" }, notes = "批量删除角色/用户组")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfgroupService.removeBatch(ids); wfgroupService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Save", tags = {"WFGroup" }, notes = "Save") @ApiOperation(value = "保存角色/用户组", tags = {"角色/用户组" }, notes = "保存角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/save") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/save")
public ResponseEntity<Boolean> save(@RequestBody WFGroupDTO wfgroupdto) { public ResponseEntity<Boolean> save(@RequestBody WFGroupDTO wfgroupdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.save(wfgroupMapping.toDomain(wfgroupdto))); return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.save(wfgroupMapping.toDomain(wfgroupdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFGroup" }, notes = "SaveBatch") @ApiOperation(value = "批量保存角色/用户组", tags = {"角色/用户组" }, notes = "批量保存角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.saveBatch(wfgroupMapping.toDomain(wfgroupdtos)); wfgroupService.saveBatch(wfgroupMapping.toDomain(wfgroupdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"WFGroup" }, notes = "Get") @ApiOperation(value = "获取角色/用户组", tags = {"角色/用户组" }, notes = "获取角色/用户组")
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}")
public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) { public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) {
WFGroup domain = wfgroupService.get(wfgroup_id); WFGroup domain = wfgroupService.get(wfgroup_id);
...@@ -81,7 +81,7 @@ public class WFGroupResource { ...@@ -81,7 +81,7 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Create", tags = {"WFGroup" }, notes = "Create") @ApiOperation(value = "新建角色/用户组", tags = {"角色/用户组" }, notes = "新建角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
public ResponseEntity<WFGroupDTO> create(@RequestBody WFGroupDTO wfgroupdto) { public ResponseEntity<WFGroupDTO> create(@RequestBody WFGroupDTO wfgroupdto) {
...@@ -91,26 +91,26 @@ public class WFGroupResource { ...@@ -91,26 +91,26 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFGroup" }, notes = "createBatch") @ApiOperation(value = "批量新建角色/用户组", tags = {"角色/用户组" }, notes = "批量新建角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.createBatch(wfgroupMapping.toDomain(wfgroupdtos)); wfgroupService.createBatch(wfgroupMapping.toDomain(wfgroupdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"WFGroup" }, notes = "GetDraft") @ApiOperation(value = "获取角色/用户组草稿", tags = {"角色/用户组" }, notes = "获取角色/用户组草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/getdraft")
public ResponseEntity<WFGroupDTO> getDraft() { public ResponseEntity<WFGroupDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupMapping.toDto(wfgroupService.getDraft(new WFGroup()))); return ResponseEntity.status(HttpStatus.OK).body(wfgroupMapping.toDto(wfgroupService.getDraft(new WFGroup())));
} }
@ApiOperation(value = "CheckKey", tags = {"WFGroup" }, notes = "CheckKey") @ApiOperation(value = "检查角色/用户组", tags = {"角色/用户组" }, notes = "检查角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFGroupDTO wfgroupdto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFGroupDTO wfgroupdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.checkKey(wfgroupMapping.toDomain(wfgroupdto))); return ResponseEntity.status(HttpStatus.OK).body(wfgroupService.checkKey(wfgroupMapping.toDomain(wfgroupdto)));
} }
@ApiOperation(value = "Update", tags = {"WFGroup" }, notes = "Update") @ApiOperation(value = "更新角色/用户组", tags = {"角色/用户组" }, notes = "更新角色/用户组")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}")
public ResponseEntity<WFGroupDTO> update(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFGroupDTO wfgroupdto) { public ResponseEntity<WFGroupDTO> update(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFGroupDTO wfgroupdto) {
...@@ -121,14 +121,14 @@ public class WFGroupResource { ...@@ -121,14 +121,14 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFGroup" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新角色/用户组", tags = {"角色/用户组" }, notes = "批量更新角色/用户组")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.updateBatch(wfgroupMapping.toDomain(wfgroupdtos)); wfgroupService.updateBatch(wfgroupMapping.toDomain(wfgroupdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFGroup" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"角色/用户组" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfgroups/fetchdefault")
public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) { public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
Page<WFGroup> domains = wfgroupService.searchDefault(context) ; Page<WFGroup> domains = wfgroupService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class WFGroupResource { ...@@ -140,7 +140,7 @@ public class WFGroupResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFGroup" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"角色/用户组" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault")
public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) { public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) {
Page<WFGroup> domains = wfgroupService.searchDefault(context) ; Page<WFGroup> domains = wfgroupService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFMemberService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFMemberService;
import cn.ibizlab.core.workflow.filter.WFMemberSearchContext; import cn.ibizlab.core.workflow.filter.WFMemberSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFMember" }) @Api(tags = {"成员" })
@RestController("api-wfmember") @RestController("api-wfmember")
@RequestMapping("") @RequestMapping("")
public class WFMemberResource { public class WFMemberResource {
...@@ -46,46 +46,46 @@ public class WFMemberResource { ...@@ -46,46 +46,46 @@ public class WFMemberResource {
@Lazy @Lazy
public WFMemberMapping wfmemberMapping; public WFMemberMapping wfmemberMapping;
@ApiOperation(value = "Remove", tags = {"WFMember" }, notes = "Remove") @ApiOperation(value = "删除成员", tags = {"成员" }, notes = "删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/{wfmember_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfmember_id") String wfmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id)); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFMember" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除成员", tags = {"成员" }, notes = "批量删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfmembers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfmemberService.removeBatch(ids); wfmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"WFMember" }, notes = "GetDraft") @ApiOperation(value = "获取成员草稿", tags = {"成员" }, notes = "获取成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/getdraft")
public ResponseEntity<WFMemberDTO> getDraft() { public ResponseEntity<WFMemberDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(new WFMember()))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(new WFMember())));
} }
@ApiOperation(value = "Save", tags = {"WFMember" }, notes = "Save") @ApiOperation(value = "保存成员", tags = {"成员" }, notes = "保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/save")
public ResponseEntity<Boolean> save(@RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> save(@RequestBody WFMemberDTO wfmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(wfmemberMapping.toDomain(wfmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(wfmemberMapping.toDomain(wfmemberdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFMember" }, notes = "SaveBatch") @ApiOperation(value = "批量保存成员", tags = {"成员" }, notes = "批量保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
wfmemberService.saveBatch(wfmemberMapping.toDomain(wfmemberdtos)); wfmemberService.saveBatch(wfmemberMapping.toDomain(wfmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"WFMember" }, notes = "CheckKey") @ApiOperation(value = "检查成员", tags = {"成员" }, notes = "检查成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFMemberDTO wfmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
} }
@ApiOperation(value = "Update", tags = {"WFMember" }, notes = "Update") @ApiOperation(value = "更新成员", tags = {"成员" }, notes = "更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> update(@PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> update(@PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) {
...@@ -96,14 +96,14 @@ public class WFMemberResource { ...@@ -96,14 +96,14 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFMember" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新成员", tags = {"成员" }, notes = "批量更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfmembers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
wfmemberService.updateBatch(wfmemberMapping.toDomain(wfmemberdtos)); wfmemberService.updateBatch(wfmemberMapping.toDomain(wfmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"WFMember" }, notes = "Create") @ApiOperation(value = "新建成员", tags = {"成员" }, notes = "新建成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers") @RequestMapping(method = RequestMethod.POST, value = "/wfmembers")
public ResponseEntity<WFMemberDTO> create(@RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> create(@RequestBody WFMemberDTO wfmemberdto) {
...@@ -113,14 +113,14 @@ public class WFMemberResource { ...@@ -113,14 +113,14 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFMember" }, notes = "createBatch") @ApiOperation(value = "批量新建成员", tags = {"成员" }, notes = "批量新建成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfmembers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFMemberDTO> wfmemberdtos) {
wfmemberService.createBatch(wfmemberMapping.toDomain(wfmemberdtos)); wfmemberService.createBatch(wfmemberMapping.toDomain(wfmemberdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"WFMember" }, notes = "Get") @ApiOperation(value = "获取成员", tags = {"成员" }, notes = "获取成员")
@RequestMapping(method = RequestMethod.GET, value = "/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> get(@PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<WFMemberDTO> get(@PathVariable("wfmember_id") String wfmember_id) {
WFMember domain = wfmemberService.get(wfmember_id); WFMember domain = wfmemberService.get(wfmember_id);
...@@ -128,7 +128,7 @@ public class WFMemberResource { ...@@ -128,7 +128,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFMember" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"成员" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfmembers/fetchdefault")
public ResponseEntity<List<WFMemberDTO>> fetchDefault(WFMemberSearchContext context) { public ResponseEntity<List<WFMemberDTO>> fetchDefault(WFMemberSearchContext context) {
Page<WFMember> domains = wfmemberService.searchDefault(context) ; Page<WFMember> domains = wfmemberService.searchDefault(context) ;
...@@ -140,28 +140,28 @@ public class WFMemberResource { ...@@ -140,28 +140,28 @@ public class WFMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFMember" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"成员" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchDefault(@RequestBody WFMemberSearchContext context) { public ResponseEntity<Page<WFMemberDTO>> searchDefault(@RequestBody WFMemberSearchContext context) {
Page<WFMember> domains = wfmemberService.searchDefault(context) ; Page<WFMember> domains = wfmemberService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "RemoveByWFGroup", tags = {"WFMember" }, notes = "RemoveByWFGroup") @ApiOperation(value = "根据角色/用户组删除成员", tags = {"成员" }, notes = "根据角色/用户组删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
public ResponseEntity<Boolean> removeByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<Boolean> removeByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id)); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id));
} }
@ApiOperation(value = "RemoveBatchByWFGroup", tags = {"WFMember" }, notes = "RemoveBatchByWFGroup") @ApiOperation(value = "根据角色/用户组批量删除成员", tags = {"成员" }, notes = "根据角色/用户组批量删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}/wfmembers/batch")
public ResponseEntity<Boolean> removeBatchByWFGroup(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByWFGroup(@RequestBody List<String> ids) {
wfmemberService.removeBatch(ids); wfmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByWFGroup", tags = {"WFMember" }, notes = "GetDraftByWFGroup") @ApiOperation(value = "根据角色/用户组获取成员草稿", tags = {"成员" }, notes = "根据角色/用户组获取成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/getdraft")
public ResponseEntity<WFMemberDTO> getDraftByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id) { public ResponseEntity<WFMemberDTO> getDraftByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id) {
WFMember domain = new WFMember(); WFMember domain = new WFMember();
...@@ -169,7 +169,7 @@ public class WFMemberResource { ...@@ -169,7 +169,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByWFGroup", tags = {"WFMember" }, notes = "SaveByWFGroup") @ApiOperation(value = "根据角色/用户组保存成员", tags = {"成员" }, notes = "根据角色/用户组保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/save")
public ResponseEntity<Boolean> saveByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> saveByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
WFMember domain = wfmemberMapping.toDomain(wfmemberdto); WFMember domain = wfmemberMapping.toDomain(wfmemberdto);
...@@ -177,7 +177,7 @@ public class WFMemberResource { ...@@ -177,7 +177,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByWFGroup", tags = {"WFMember" }, notes = "SaveBatchByWFGroup") @ApiOperation(value = "根据角色/用户组批量保存成员", tags = {"成员" }, notes = "根据角色/用户组批量保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> saveBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -188,13 +188,13 @@ public class WFMemberResource { ...@@ -188,13 +188,13 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByWFGroup", tags = {"WFMember" }, notes = "CheckKeyByWFGroup") @ApiOperation(value = "根据角色/用户组检查成员", tags = {"成员" }, notes = "根据角色/用户组检查成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> checkKeyByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
} }
@ApiOperation(value = "UpdateByWFGroup", tags = {"WFMember" }, notes = "UpdateByWFGroup") @ApiOperation(value = "根据角色/用户组更新成员", tags = {"成员" }, notes = "根据角色/用户组更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> updateByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> updateByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) {
...@@ -206,7 +206,7 @@ public class WFMemberResource { ...@@ -206,7 +206,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByWFGroup", tags = {"WFMember" }, notes = "UpdateBatchByWFGroup") @ApiOperation(value = "根据角色/用户组批量更新成员", tags = {"成员" }, notes = "根据角色/用户组批量更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfgroups/{wfgroup_id}/wfmembers/batch")
public ResponseEntity<Boolean> updateBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> updateBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -217,7 +217,7 @@ public class WFMemberResource { ...@@ -217,7 +217,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByWFGroup", tags = {"WFMember" }, notes = "CreateByWFGroup") @ApiOperation(value = "根据角色/用户组建立成员", tags = {"成员" }, notes = "根据角色/用户组建立成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers")
public ResponseEntity<WFMemberDTO> createByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> createByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberDTO wfmemberdto) {
...@@ -228,7 +228,7 @@ public class WFMemberResource { ...@@ -228,7 +228,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByWFGroup", tags = {"WFMember" }, notes = "createBatchByWFGroup") @ApiOperation(value = "根据角色/用户组批量建立成员", tags = {"成员" }, notes = "根据角色/用户组批量建立成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfgroups/{wfgroup_id}/wfmembers/batch")
public ResponseEntity<Boolean> createBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> createBatchByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -239,7 +239,7 @@ public class WFMemberResource { ...@@ -239,7 +239,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByWFGroup", tags = {"WFMember" }, notes = "GetByWFGroup") @ApiOperation(value = "根据角色/用户组获取成员", tags = {"成员" }, notes = "根据角色/用户组获取成员")
@RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfgroups/{wfgroup_id}/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> getByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<WFMemberDTO> getByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @PathVariable("wfmember_id") String wfmember_id) {
WFMember domain = wfmemberService.get(wfmember_id); WFMember domain = wfmemberService.get(wfmember_id);
...@@ -247,7 +247,7 @@ public class WFMemberResource { ...@@ -247,7 +247,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULTByWFGroup", tags = {"WFMember" } ,notes = "fetchDEFAULTByWFGroup") @ApiOperation(value = "根据角色/用户组获取DEFAULT", tags = {"成员" } ,notes = "根据角色/用户组获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfgroups/{wfgroup_id}/wfmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfgroups/{wfgroup_id}/wfmembers/fetchdefault")
public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id,WFMemberSearchContext context) { public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id,WFMemberSearchContext context) {
context.setN_groupid_eq(wfgroup_id); context.setN_groupid_eq(wfgroup_id);
...@@ -260,7 +260,7 @@ public class WFMemberResource { ...@@ -260,7 +260,7 @@ public class WFMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByWFGroup", tags = {"WFMember" } ,notes = "searchDEFAULTByWFGroup") @ApiOperation(value = "根据角色/用户组查询DEFAULT", tags = {"成员" } ,notes = "根据角色/用户组查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfgroups/{wfgroup_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberSearchContext context) { public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFGroup(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFMemberSearchContext context) {
context.setN_groupid_eq(wfgroup_id); context.setN_groupid_eq(wfgroup_id);
...@@ -268,21 +268,21 @@ public class WFMemberResource { ...@@ -268,21 +268,21 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(wfmemberMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@ApiOperation(value = "RemoveByWFUser", tags = {"WFMember" }, notes = "RemoveByWFUser") @ApiOperation(value = "根据用户删除成员", tags = {"成员" }, notes = "根据用户删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
public ResponseEntity<Boolean> removeByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<Boolean> removeByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id)); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.remove(wfmember_id));
} }
@ApiOperation(value = "RemoveBatchByWFUser", tags = {"WFMember" }, notes = "RemoveBatchByWFUser") @ApiOperation(value = "根据用户批量删除成员", tags = {"成员" }, notes = "根据用户批量删除成员")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}/wfmembers/batch")
public ResponseEntity<Boolean> removeBatchByWFUser(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatchByWFUser(@RequestBody List<String> ids) {
wfmemberService.removeBatch(ids); wfmemberService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraftByWFUser", tags = {"WFMember" }, notes = "GetDraftByWFUser") @ApiOperation(value = "根据用户获取成员草稿", tags = {"成员" }, notes = "根据用户获取成员草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/getdraft")
public ResponseEntity<WFMemberDTO> getDraftByWFUser(@PathVariable("wfuser_id") String wfuser_id) { public ResponseEntity<WFMemberDTO> getDraftByWFUser(@PathVariable("wfuser_id") String wfuser_id) {
WFMember domain = new WFMember(); WFMember domain = new WFMember();
...@@ -290,7 +290,7 @@ public class WFMemberResource { ...@@ -290,7 +290,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberMapping.toDto(wfmemberService.getDraft(domain)));
} }
@ApiOperation(value = "SaveByWFUser", tags = {"WFMember" }, notes = "SaveByWFUser") @ApiOperation(value = "根据用户保存成员", tags = {"成员" }, notes = "根据用户保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/save") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/save")
public ResponseEntity<Boolean> saveByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> saveByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
WFMember domain = wfmemberMapping.toDomain(wfmemberdto); WFMember domain = wfmemberMapping.toDomain(wfmemberdto);
...@@ -298,7 +298,7 @@ public class WFMemberResource { ...@@ -298,7 +298,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain)); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.save(domain));
} }
@ApiOperation(value = "SaveBatchByWFUser", tags = {"WFMember" }, notes = "SaveBatchByWFUser") @ApiOperation(value = "根据用户批量保存成员", tags = {"成员" }, notes = "根据用户批量保存成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/savebatch")
public ResponseEntity<Boolean> saveBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> saveBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -309,13 +309,13 @@ public class WFMemberResource { ...@@ -309,13 +309,13 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKeyByWFUser", tags = {"WFMember" }, notes = "CheckKeyByWFUser") @ApiOperation(value = "根据用户检查成员", tags = {"成员" }, notes = "根据用户检查成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/checkkey")
public ResponseEntity<Boolean> checkKeyByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<Boolean> checkKeyByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto))); return ResponseEntity.status(HttpStatus.OK).body(wfmemberService.checkKey(wfmemberMapping.toDomain(wfmemberdto)));
} }
@ApiOperation(value = "UpdateByWFUser", tags = {"WFMember" }, notes = "UpdateByWFUser") @ApiOperation(value = "根据用户更新成员", tags = {"成员" }, notes = "根据用户更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> updateByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> updateByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id, @RequestBody WFMemberDTO wfmemberdto) {
...@@ -327,7 +327,7 @@ public class WFMemberResource { ...@@ -327,7 +327,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatchByWFUser", tags = {"WFMember" }, notes = "UpdateBatchByWFUser") @ApiOperation(value = "根据用户批量更新成员", tags = {"成员" }, notes = "根据用户批量更新成员")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}/wfmembers/batch")
public ResponseEntity<Boolean> updateBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> updateBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -338,7 +338,7 @@ public class WFMemberResource { ...@@ -338,7 +338,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CreateByWFUser", tags = {"WFMember" }, notes = "CreateByWFUser") @ApiOperation(value = "根据用户建立成员", tags = {"成员" }, notes = "根据用户建立成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers")
public ResponseEntity<WFMemberDTO> createByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) { public ResponseEntity<WFMemberDTO> createByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberDTO wfmemberdto) {
...@@ -349,7 +349,7 @@ public class WFMemberResource { ...@@ -349,7 +349,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatchByWFUser", tags = {"WFMember" }, notes = "createBatchByWFUser") @ApiOperation(value = "根据用户批量建立成员", tags = {"成员" }, notes = "根据用户批量建立成员")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/{wfuser_id}/wfmembers/batch")
public ResponseEntity<Boolean> createBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) { public ResponseEntity<Boolean> createBatchByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody List<WFMemberDTO> wfmemberdtos) {
List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos); List<WFMember> domainlist=wfmemberMapping.toDomain(wfmemberdtos);
...@@ -360,7 +360,7 @@ public class WFMemberResource { ...@@ -360,7 +360,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetByWFUser", tags = {"WFMember" }, notes = "GetByWFUser") @ApiOperation(value = "根据用户获取成员", tags = {"成员" }, notes = "根据用户获取成员")
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}/wfmembers/{wfmember_id}")
public ResponseEntity<WFMemberDTO> getByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) { public ResponseEntity<WFMemberDTO> getByWFUser(@PathVariable("wfuser_id") String wfuser_id, @PathVariable("wfmember_id") String wfmember_id) {
WFMember domain = wfmemberService.get(wfmember_id); WFMember domain = wfmemberService.get(wfmember_id);
...@@ -368,7 +368,7 @@ public class WFMemberResource { ...@@ -368,7 +368,7 @@ public class WFMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "fetchDEFAULTByWFUser") @ApiOperation(value = "根据用户获取DEFAULT", tags = {"成员" } ,notes = "根据用户获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfusers/{wfuser_id}/wfmembers/fetchdefault")
public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) { public ResponseEntity<List<WFMemberDTO>> fetchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id,WFMemberSearchContext context) {
context.setN_userid_eq(wfuser_id); context.setN_userid_eq(wfuser_id);
...@@ -381,7 +381,7 @@ public class WFMemberResource { ...@@ -381,7 +381,7 @@ public class WFMemberResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULTByWFUser", tags = {"WFMember" } ,notes = "searchDEFAULTByWFUser") @ApiOperation(value = "根据用户查询DEFAULT", tags = {"成员" } ,notes = "根据用户查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfusers/{wfuser_id}/wfmembers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfusers/{wfuser_id}/wfmembers/searchdefault")
public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberSearchContext context) { public ResponseEntity<Page<WFMemberDTO>> searchWFMemberDefaultByWFUser(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFMemberSearchContext context) {
context.setN_userid_eq(wfuser_id); context.setN_userid_eq(wfuser_id);
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFProcessDefinitionService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFProcessDefinitionService;
import cn.ibizlab.core.workflow.filter.WFProcessDefinitionSearchContext; import cn.ibizlab.core.workflow.filter.WFProcessDefinitionSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFProcessDefinition" }) @Api(tags = {"流程定义" })
@RestController("api-wfprocessdefinition") @RestController("api-wfprocessdefinition")
@RequestMapping("") @RequestMapping("")
public class WFProcessDefinitionResource { public class WFProcessDefinitionResource {
...@@ -46,40 +46,40 @@ public class WFProcessDefinitionResource { ...@@ -46,40 +46,40 @@ public class WFProcessDefinitionResource {
@Lazy @Lazy
public WFProcessDefinitionMapping wfprocessdefinitionMapping; public WFProcessDefinitionMapping wfprocessdefinitionMapping;
@ApiOperation(value = "CheckKey", tags = {"WFProcessDefinition" }, notes = "CheckKey") @ApiOperation(value = "检查流程定义", tags = {"流程定义" }, notes = "检查流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.checkKey(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondto))); return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.checkKey(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondto)));
} }
@ApiOperation(value = "Remove", tags = {"WFProcessDefinition" }, notes = "Remove") @ApiOperation(value = "删除流程定义", tags = {"流程定义" }, notes = "删除流程定义")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/{wfprocessdefinition_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.remove(wfprocessdefinition_id)); return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.remove(wfprocessdefinition_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFProcessDefinition" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除流程定义", tags = {"流程定义" }, notes = "批量删除流程定义")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfprocessdefinitionService.removeBatch(ids); wfprocessdefinitionService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Save", tags = {"WFProcessDefinition" }, notes = "Save") @ApiOperation(value = "保存流程定义", tags = {"流程定义" }, notes = "保存流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/save") @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/save")
public ResponseEntity<Boolean> save(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) { public ResponseEntity<Boolean> save(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.save(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondto))); return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionService.save(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFProcessDefinition" }, notes = "SaveBatch") @ApiOperation(value = "批量保存流程定义", tags = {"流程定义" }, notes = "批量保存流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.saveBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos)); wfprocessdefinitionService.saveBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Create", tags = {"WFProcessDefinition" }, notes = "Create") @ApiOperation(value = "新建流程定义", tags = {"流程定义" }, notes = "新建流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions") @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions")
public ResponseEntity<WFProcessDefinitionDTO> create(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) { public ResponseEntity<WFProcessDefinitionDTO> create(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
...@@ -89,20 +89,20 @@ public class WFProcessDefinitionResource { ...@@ -89,20 +89,20 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFProcessDefinition" }, notes = "createBatch") @ApiOperation(value = "批量新建流程定义", tags = {"流程定义" }, notes = "批量新建流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.createBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos)); wfprocessdefinitionService.createBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"WFProcessDefinition" }, notes = "GetDraft") @ApiOperation(value = "获取流程定义草稿", tags = {"流程定义" }, notes = "获取流程定义草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/getdraft")
public ResponseEntity<WFProcessDefinitionDTO> getDraft() { public ResponseEntity<WFProcessDefinitionDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionMapping.toDto(wfprocessdefinitionService.getDraft(new WFProcessDefinition()))); return ResponseEntity.status(HttpStatus.OK).body(wfprocessdefinitionMapping.toDto(wfprocessdefinitionService.getDraft(new WFProcessDefinition())));
} }
@ApiOperation(value = "Update", tags = {"WFProcessDefinition" }, notes = "Update") @ApiOperation(value = "更新流程定义", tags = {"流程定义" }, notes = "更新流程定义")
@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/{wfprocessdefinition_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
public ResponseEntity<WFProcessDefinitionDTO> update(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id, @RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) { public ResponseEntity<WFProcessDefinitionDTO> update(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id, @RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
...@@ -113,14 +113,14 @@ public class WFProcessDefinitionResource { ...@@ -113,14 +113,14 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFProcessDefinition" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新流程定义", tags = {"流程定义" }, notes = "批量更新流程定义")
@RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfprocessdefinitions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.updateBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos)); wfprocessdefinitionService.updateBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"WFProcessDefinition" }, notes = "Get") @ApiOperation(value = "获取流程定义", tags = {"流程定义" }, notes = "获取流程定义")
@RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/{wfprocessdefinition_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfprocessdefinitions/{wfprocessdefinition_id}")
public ResponseEntity<WFProcessDefinitionDTO> get(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) { public ResponseEntity<WFProcessDefinitionDTO> get(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) {
WFProcessDefinition domain = wfprocessdefinitionService.get(wfprocessdefinition_id); WFProcessDefinition domain = wfprocessdefinitionService.get(wfprocessdefinition_id);
...@@ -128,7 +128,7 @@ public class WFProcessDefinitionResource { ...@@ -128,7 +128,7 @@ public class WFProcessDefinitionResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"流程定义" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfprocessdefinitions/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfprocessdefinitions/fetchdefault")
public ResponseEntity<List<WFProcessDefinitionDTO>> fetchDefault(WFProcessDefinitionSearchContext context) { public ResponseEntity<List<WFProcessDefinitionDTO>> fetchDefault(WFProcessDefinitionSearchContext context) {
Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ; Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class WFProcessDefinitionResource { ...@@ -140,7 +140,7 @@ public class WFProcessDefinitionResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"流程定义" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfprocessdefinitions/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfprocessdefinitions/searchdefault")
public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(@RequestBody WFProcessDefinitionSearchContext context) { public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(@RequestBody WFProcessDefinitionSearchContext context) {
Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ; Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFREModelService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFREModelService;
import cn.ibizlab.core.workflow.filter.WFREModelSearchContext; import cn.ibizlab.core.workflow.filter.WFREModelSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFREModel" }) @Api(tags = {"流程模型" })
@RestController("api-wfremodel") @RestController("api-wfremodel")
@RequestMapping("") @RequestMapping("")
public class WFREModelResource { public class WFREModelResource {
...@@ -46,7 +46,7 @@ public class WFREModelResource { ...@@ -46,7 +46,7 @@ public class WFREModelResource {
@Lazy @Lazy
public WFREModelMapping wfremodelMapping; public WFREModelMapping wfremodelMapping;
@ApiOperation(value = "Create", tags = {"WFREModel" }, notes = "Create") @ApiOperation(value = "新建流程模型", tags = {"流程模型" }, notes = "新建流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels") @RequestMapping(method = RequestMethod.POST, value = "/wfremodels")
public ResponseEntity<WFREModelDTO> create(@RequestBody WFREModelDTO wfremodeldto) { public ResponseEntity<WFREModelDTO> create(@RequestBody WFREModelDTO wfremodeldto) {
...@@ -56,14 +56,14 @@ public class WFREModelResource { ...@@ -56,14 +56,14 @@ public class WFREModelResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFREModel" }, notes = "createBatch") @ApiOperation(value = "批量新建流程模型", tags = {"流程模型" }, notes = "批量新建流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.createBatch(wfremodelMapping.toDomain(wfremodeldtos)); wfremodelService.createBatch(wfremodelMapping.toDomain(wfremodeldtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"WFREModel" }, notes = "Get") @ApiOperation(value = "获取流程模型", tags = {"流程模型" }, notes = "获取流程模型")
@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/{wfremodel_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/{wfremodel_id}")
public ResponseEntity<WFREModelDTO> get(@PathVariable("wfremodel_id") String wfremodel_id) { public ResponseEntity<WFREModelDTO> get(@PathVariable("wfremodel_id") String wfremodel_id) {
WFREModel domain = wfremodelService.get(wfremodel_id); WFREModel domain = wfremodelService.get(wfremodel_id);
...@@ -71,20 +71,20 @@ public class WFREModelResource { ...@@ -71,20 +71,20 @@ public class WFREModelResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Save", tags = {"WFREModel" }, notes = "Save") @ApiOperation(value = "保存流程模型", tags = {"流程模型" }, notes = "保存流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/save") @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/save")
public ResponseEntity<Boolean> save(@RequestBody WFREModelDTO wfremodeldto) { public ResponseEntity<Boolean> save(@RequestBody WFREModelDTO wfremodeldto) {
return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.save(wfremodelMapping.toDomain(wfremodeldto))); return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.save(wfremodelMapping.toDomain(wfremodeldto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFREModel" }, notes = "SaveBatch") @ApiOperation(value = "批量保存流程模型", tags = {"流程模型" }, notes = "批量保存流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.saveBatch(wfremodelMapping.toDomain(wfremodeldtos)); wfremodelService.saveBatch(wfremodelMapping.toDomain(wfremodeldtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Update", tags = {"WFREModel" }, notes = "Update") @ApiOperation(value = "更新流程模型", tags = {"流程模型" }, notes = "更新流程模型")
@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/{wfremodel_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/{wfremodel_id}")
public ResponseEntity<WFREModelDTO> update(@PathVariable("wfremodel_id") String wfremodel_id, @RequestBody WFREModelDTO wfremodeldto) { public ResponseEntity<WFREModelDTO> update(@PathVariable("wfremodel_id") String wfremodel_id, @RequestBody WFREModelDTO wfremodeldto) {
...@@ -95,40 +95,40 @@ public class WFREModelResource { ...@@ -95,40 +95,40 @@ public class WFREModelResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFREModel" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新流程模型", tags = {"流程模型" }, notes = "批量更新流程模型")
@RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfremodels/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.updateBatch(wfremodelMapping.toDomain(wfremodeldtos)); wfremodelService.updateBatch(wfremodelMapping.toDomain(wfremodeldtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"WFREModel" }, notes = "GetDraft") @ApiOperation(value = "获取流程模型草稿", tags = {"流程模型" }, notes = "获取流程模型草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfremodels/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfremodels/getdraft")
public ResponseEntity<WFREModelDTO> getDraft() { public ResponseEntity<WFREModelDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfremodelMapping.toDto(wfremodelService.getDraft(new WFREModel()))); return ResponseEntity.status(HttpStatus.OK).body(wfremodelMapping.toDto(wfremodelService.getDraft(new WFREModel())));
} }
@ApiOperation(value = "Remove", tags = {"WFREModel" }, notes = "Remove") @ApiOperation(value = "删除流程模型", tags = {"流程模型" }, notes = "删除流程模型")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/{wfremodel_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/{wfremodel_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfremodel_id") String wfremodel_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfremodel_id") String wfremodel_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.remove(wfremodel_id)); return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.remove(wfremodel_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFREModel" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除流程模型", tags = {"流程模型" }, notes = "批量删除流程模型")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfremodels/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfremodelService.removeBatch(ids); wfremodelService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"WFREModel" }, notes = "CheckKey") @ApiOperation(value = "检查流程模型", tags = {"流程模型" }, notes = "检查流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfremodels/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFREModelDTO wfremodeldto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFREModelDTO wfremodeldto) {
return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.checkKey(wfremodelMapping.toDomain(wfremodeldto))); return ResponseEntity.status(HttpStatus.OK).body(wfremodelService.checkKey(wfremodelMapping.toDomain(wfremodeldto)));
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFREModel" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"流程模型" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfremodels/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfremodels/fetchdefault")
public ResponseEntity<List<WFREModelDTO>> fetchDefault(WFREModelSearchContext context) { public ResponseEntity<List<WFREModelDTO>> fetchDefault(WFREModelSearchContext context) {
Page<WFREModel> domains = wfremodelService.searchDefault(context) ; Page<WFREModel> domains = wfremodelService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class WFREModelResource { ...@@ -140,7 +140,7 @@ public class WFREModelResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFREModel" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"流程模型" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfremodels/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfremodels/searchdefault")
public ResponseEntity<Page<WFREModelDTO>> searchDefault(@RequestBody WFREModelSearchContext context) { public ResponseEntity<Page<WFREModelDTO>> searchDefault(@RequestBody WFREModelSearchContext context) {
Page<WFREModel> domains = wfremodelService.searchDefault(context) ; Page<WFREModel> domains = wfremodelService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFSystemService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFSystemService;
import cn.ibizlab.core.workflow.filter.WFSystemSearchContext; import cn.ibizlab.core.workflow.filter.WFSystemSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFSystem" }) @Api(tags = {"系统" })
@RestController("api-wfsystem") @RestController("api-wfsystem")
@RequestMapping("") @RequestMapping("")
public class WFSystemResource { public class WFSystemResource {
...@@ -46,34 +46,34 @@ public class WFSystemResource { ...@@ -46,34 +46,34 @@ public class WFSystemResource {
@Lazy @Lazy
public WFSystemMapping wfsystemMapping; public WFSystemMapping wfsystemMapping;
@ApiOperation(value = "Save", tags = {"WFSystem" }, notes = "Save") @ApiOperation(value = "保存系统", tags = {"系统" }, notes = "保存系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save") @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save")
public ResponseEntity<Boolean> save(@RequestBody WFSystemDTO wfsystemdto) { public ResponseEntity<Boolean> save(@RequestBody WFSystemDTO wfsystemdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.save(wfsystemMapping.toDomain(wfsystemdto))); return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.save(wfsystemMapping.toDomain(wfsystemdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFSystem" }, notes = "SaveBatch") @ApiOperation(value = "批量保存系统", tags = {"系统" }, notes = "批量保存系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.saveBatch(wfsystemMapping.toDomain(wfsystemdtos)); wfsystemService.saveBatch(wfsystemMapping.toDomain(wfsystemdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Remove", tags = {"WFSystem" }, notes = "Remove") @ApiOperation(value = "删除系统", tags = {"系统" }, notes = "删除系统")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/{wfsystem_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/{wfsystem_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfsystem_id") String wfsystem_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfsystem_id") String wfsystem_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.remove(wfsystem_id)); return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.remove(wfsystem_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFSystem" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除系统", tags = {"系统" }, notes = "批量删除系统")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfsystems/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfsystemService.removeBatch(ids); wfsystemService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Get", tags = {"WFSystem" }, notes = "Get") @ApiOperation(value = "获取系统", tags = {"系统" }, notes = "获取系统")
@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/{wfsystem_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/{wfsystem_id}")
public ResponseEntity<WFSystemDTO> get(@PathVariable("wfsystem_id") String wfsystem_id) { public ResponseEntity<WFSystemDTO> get(@PathVariable("wfsystem_id") String wfsystem_id) {
WFSystem domain = wfsystemService.get(wfsystem_id); WFSystem domain = wfsystemService.get(wfsystem_id);
...@@ -81,13 +81,13 @@ public class WFSystemResource { ...@@ -81,13 +81,13 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "GetDraft", tags = {"WFSystem" }, notes = "GetDraft") @ApiOperation(value = "获取系统草稿", tags = {"系统" }, notes = "获取系统草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfsystems/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfsystems/getdraft")
public ResponseEntity<WFSystemDTO> getDraft() { public ResponseEntity<WFSystemDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemMapping.toDto(wfsystemService.getDraft(new WFSystem()))); return ResponseEntity.status(HttpStatus.OK).body(wfsystemMapping.toDto(wfsystemService.getDraft(new WFSystem())));
} }
@ApiOperation(value = "Create", tags = {"WFSystem" }, notes = "Create") @ApiOperation(value = "新建系统", tags = {"系统" }, notes = "新建系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems") @RequestMapping(method = RequestMethod.POST, value = "/wfsystems")
public ResponseEntity<WFSystemDTO> create(@RequestBody WFSystemDTO wfsystemdto) { public ResponseEntity<WFSystemDTO> create(@RequestBody WFSystemDTO wfsystemdto) {
...@@ -97,20 +97,20 @@ public class WFSystemResource { ...@@ -97,20 +97,20 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFSystem" }, notes = "createBatch") @ApiOperation(value = "批量新建系统", tags = {"系统" }, notes = "批量新建系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.createBatch(wfsystemMapping.toDomain(wfsystemdtos)); wfsystemService.createBatch(wfsystemMapping.toDomain(wfsystemdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"WFSystem" }, notes = "CheckKey") @ApiOperation(value = "检查系统", tags = {"系统" }, notes = "检查系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfsystems/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFSystemDTO wfsystemdto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFSystemDTO wfsystemdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.checkKey(wfsystemMapping.toDomain(wfsystemdto))); return ResponseEntity.status(HttpStatus.OK).body(wfsystemService.checkKey(wfsystemMapping.toDomain(wfsystemdto)));
} }
@ApiOperation(value = "Update", tags = {"WFSystem" }, notes = "Update") @ApiOperation(value = "更新系统", tags = {"系统" }, notes = "更新系统")
@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/{wfsystem_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/{wfsystem_id}")
public ResponseEntity<WFSystemDTO> update(@PathVariable("wfsystem_id") String wfsystem_id, @RequestBody WFSystemDTO wfsystemdto) { public ResponseEntity<WFSystemDTO> update(@PathVariable("wfsystem_id") String wfsystem_id, @RequestBody WFSystemDTO wfsystemdto) {
...@@ -121,14 +121,14 @@ public class WFSystemResource { ...@@ -121,14 +121,14 @@ public class WFSystemResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFSystem" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新系统", tags = {"系统" }, notes = "批量更新系统")
@RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfsystems/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.updateBatch(wfsystemMapping.toDomain(wfsystemdtos)); wfsystemService.updateBatch(wfsystemMapping.toDomain(wfsystemdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFSystem" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"系统" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfsystems/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfsystems/fetchdefault")
public ResponseEntity<List<WFSystemDTO>> fetchDefault(WFSystemSearchContext context) { public ResponseEntity<List<WFSystemDTO>> fetchDefault(WFSystemSearchContext context) {
Page<WFSystem> domains = wfsystemService.searchDefault(context) ; Page<WFSystem> domains = wfsystemService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class WFSystemResource { ...@@ -140,7 +140,7 @@ public class WFSystemResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFSystem" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"系统" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfsystems/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfsystems/searchdefault")
public ResponseEntity<Page<WFSystemDTO>> searchDefault(@RequestBody WFSystemSearchContext context) { public ResponseEntity<Page<WFSystemDTO>> searchDefault(@RequestBody WFSystemSearchContext context) {
Page<WFSystem> domains = wfsystemService.searchDefault(context) ; Page<WFSystem> domains = wfsystemService.searchDefault(context) ;
......
...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFUserService; ...@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFUserService;
import cn.ibizlab.core.workflow.filter.WFUserSearchContext; import cn.ibizlab.core.workflow.filter.WFUserSearchContext;
@Slf4j @Slf4j
@Api(tags = {"WFUser" }) @Api(tags = {"用户" })
@RestController("api-wfuser") @RestController("api-wfuser")
@RequestMapping("") @RequestMapping("")
public class WFUserResource { public class WFUserResource {
...@@ -46,7 +46,7 @@ public class WFUserResource { ...@@ -46,7 +46,7 @@ public class WFUserResource {
@Lazy @Lazy
public WFUserMapping wfuserMapping; public WFUserMapping wfuserMapping;
@ApiOperation(value = "Update", tags = {"WFUser" }, notes = "Update") @ApiOperation(value = "更新用户", tags = {"用户" }, notes = "更新用户")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}") @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}")
public ResponseEntity<WFUserDTO> update(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFUserDTO wfuserdto) { public ResponseEntity<WFUserDTO> update(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFUserDTO wfuserdto) {
...@@ -57,20 +57,20 @@ public class WFUserResource { ...@@ -57,20 +57,20 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "UpdateBatch", tags = {"WFUser" }, notes = "UpdateBatch") @ApiOperation(value = "批量更新用户", tags = {"用户" }, notes = "批量更新用户")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch") @RequestMapping(method = RequestMethod.PUT, value = "/wfusers/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) { public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.updateBatch(wfuserMapping.toDomain(wfuserdtos)); wfuserService.updateBatch(wfuserMapping.toDomain(wfuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "GetDraft", tags = {"WFUser" }, notes = "GetDraft") @ApiOperation(value = "获取用户草稿", tags = {"用户" }, notes = "获取用户草稿")
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/getdraft") @RequestMapping(method = RequestMethod.GET, value = "/wfusers/getdraft")
public ResponseEntity<WFUserDTO> getDraft() { public ResponseEntity<WFUserDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(wfuserMapping.toDto(wfuserService.getDraft(new WFUser()))); return ResponseEntity.status(HttpStatus.OK).body(wfuserMapping.toDto(wfuserService.getDraft(new WFUser())));
} }
@ApiOperation(value = "Get", tags = {"WFUser" }, notes = "Get") @ApiOperation(value = "获取用户", tags = {"用户" }, notes = "获取用户")
@RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}") @RequestMapping(method = RequestMethod.GET, value = "/wfusers/{wfuser_id}")
public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) { public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) {
WFUser domain = wfuserService.get(wfuser_id); WFUser domain = wfuserService.get(wfuser_id);
...@@ -78,7 +78,7 @@ public class WFUserResource { ...@@ -78,7 +78,7 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "Create", tags = {"WFUser" }, notes = "Create") @ApiOperation(value = "新建用户", tags = {"用户" }, notes = "新建用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers") @RequestMapping(method = RequestMethod.POST, value = "/wfusers")
public ResponseEntity<WFUserDTO> create(@RequestBody WFUserDTO wfuserdto) { public ResponseEntity<WFUserDTO> create(@RequestBody WFUserDTO wfuserdto) {
...@@ -88,47 +88,47 @@ public class WFUserResource { ...@@ -88,47 +88,47 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto); return ResponseEntity.status(HttpStatus.OK).body(dto);
} }
@ApiOperation(value = "createBatch", tags = {"WFUser" }, notes = "createBatch") @ApiOperation(value = "批量新建用户", tags = {"用户" }, notes = "批量新建用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) { public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.createBatch(wfuserMapping.toDomain(wfuserdtos)); wfuserService.createBatch(wfuserMapping.toDomain(wfuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "CheckKey", tags = {"WFUser" }, notes = "CheckKey") @ApiOperation(value = "检查用户", tags = {"用户" }, notes = "检查用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/checkkey") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFUserDTO wfuserdto) { public ResponseEntity<Boolean> checkKey(@RequestBody WFUserDTO wfuserdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfuserService.checkKey(wfuserMapping.toDomain(wfuserdto))); return ResponseEntity.status(HttpStatus.OK).body(wfuserService.checkKey(wfuserMapping.toDomain(wfuserdto)));
} }
@ApiOperation(value = "Save", tags = {"WFUser" }, notes = "Save") @ApiOperation(value = "保存用户", tags = {"用户" }, notes = "保存用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/save") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/save")
public ResponseEntity<Boolean> save(@RequestBody WFUserDTO wfuserdto) { public ResponseEntity<Boolean> save(@RequestBody WFUserDTO wfuserdto) {
return ResponseEntity.status(HttpStatus.OK).body(wfuserService.save(wfuserMapping.toDomain(wfuserdto))); return ResponseEntity.status(HttpStatus.OK).body(wfuserService.save(wfuserMapping.toDomain(wfuserdto)));
} }
@ApiOperation(value = "SaveBatch", tags = {"WFUser" }, notes = "SaveBatch") @ApiOperation(value = "批量保存用户", tags = {"用户" }, notes = "批量保存用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers/savebatch") @RequestMapping(method = RequestMethod.POST, value = "/wfusers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFUserDTO> wfuserdtos) { public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.saveBatch(wfuserMapping.toDomain(wfuserdtos)); wfuserService.saveBatch(wfuserMapping.toDomain(wfuserdtos));
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "Remove", tags = {"WFUser" }, notes = "Remove") @ApiOperation(value = "删除用户", tags = {"用户" }, notes = "删除用户")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}") @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/{wfuser_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfuser_id") String wfuser_id) { public ResponseEntity<Boolean> remove(@PathVariable("wfuser_id") String wfuser_id) {
return ResponseEntity.status(HttpStatus.OK).body(wfuserService.remove(wfuser_id)); return ResponseEntity.status(HttpStatus.OK).body(wfuserService.remove(wfuser_id));
} }
@ApiOperation(value = "RemoveBatch", tags = {"WFUser" }, notes = "RemoveBatch") @ApiOperation(value = "批量删除用户", tags = {"用户" }, notes = "批量删除用户")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/batch") @RequestMapping(method = RequestMethod.DELETE, value = "/wfusers/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) { public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfuserService.removeBatch(ids); wfuserService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@ApiOperation(value = "fetchDEFAULT", tags = {"WFUser" } ,notes = "fetchDEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"用户" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/wfusers/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/wfusers/fetchdefault")
public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) { public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) {
Page<WFUser> domains = wfuserService.searchDefault(context) ; Page<WFUser> domains = wfuserService.searchDefault(context) ;
...@@ -140,7 +140,7 @@ public class WFUserResource { ...@@ -140,7 +140,7 @@ public class WFUserResource {
.body(list); .body(list);
} }
@ApiOperation(value = "searchDEFAULT", tags = {"WFUser" } ,notes = "searchDEFAULT") @ApiOperation(value = "查询DEFAULT", tags = {"用户" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfusers/searchdefault") @RequestMapping(method= RequestMethod.POST , value="/wfusers/searchdefault")
public ResponseEntity<Page<WFUserDTO>> searchDefault(@RequestBody WFUserSearchContext context) { public ResponseEntity<Page<WFUserDTO>> searchDefault(@RequestBody WFUserSearchContext context) {
Page<WFUser> domains = wfuserService.searchDefault(context) ; Page<WFUser> domains = wfuserService.searchDefault(context) ;
......
package cn.ibizlab.util.domain;
import cn.ibizlab.util.helper.DataObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.*;
import org.springframework.util.DigestUtils;
import org.springframework.util.StringUtils;
import java.sql.Timestamp;
@TableName(value = "IBZCFG")
@JsonIgnoreProperties(ignoreUnknown = true)
@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class IBZConfig {
/**
* 配置标识
* 系统+配置类型+引用对象+用户标识联合主键
*/
@TableId
private String cfgId;
/**
* 系统标识
*/
private String systemId;
/**
* 配置类型
* 门户配置/表格自定义配置/自定义查询...消费方自定义
*/
private String cfgType;
/**
* 引用对象
* 门户页标识/具体表格视图标识...消费方具体使用位置的标识
*/
private String targetType;
/**
* 用户标识
* 默认当前登录者
*/
private String userId;
/**
* 配置
* JSONObject
*/
private String cfg;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(format="yyyy-MM-dd HH:mm:ss")
private Timestamp updateDate;
public String getCfgId()
{
if(StringUtils.isEmpty(cfgId)&&
(!(StringUtils.isEmpty(systemId)))&&
(!(StringUtils.isEmpty(cfgType)))&&
(!(StringUtils.isEmpty(targetType)))&&
(!(StringUtils.isEmpty(userId))))
{
cfgId= DigestUtils.md5DigestAsHex((systemId+"||"+cfgType+"||"+targetType+"||"+userId).getBytes());
}
return cfgId;
}
}
package cn.ibizlab.util.mapper;
import cn.ibizlab.util.domain.IBZConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface IBZConfigMapper extends BaseMapper<IBZConfig>{
}
\ No newline at end of file
package cn.ibizlab.util.rest; package cn.ibizlab.util.rest;
import cn.ibizlab.util.errors.BadRequestAlertException;
import cn.ibizlab.util.service.IBZConfigService;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import cn.ibizlab.util.security.AuthenticationUser; import cn.ibizlab.util.security.AuthenticationUser;
import cn.ibizlab.util.service.AuthenticationUserService; import cn.ibizlab.util.service.AuthenticationUserService;
...@@ -8,9 +10,8 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -8,9 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
...@@ -23,6 +24,10 @@ public class AppController { ...@@ -23,6 +24,10 @@ public class AppController {
@Value("${ibiz.enablePermissionValid:false}") @Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验 boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:ibzrt}")
private String systemId;
@Autowired @Autowired
private AuthenticationUserService userDetailsService; private AuthenticationUserService userDetailsService;
...@@ -39,10 +44,10 @@ public class AppController { ...@@ -39,10 +44,10 @@ public class AppController {
while(it.hasNext()) { while(it.hasNext()) {
GrantedAuthority authority = (GrantedAuthority)it.next(); GrantedAuthority authority = (GrantedAuthority)it.next();
String strAuthority=authority.getAuthority(); String strAuthority=authority.getAuthority();
if(strAuthority.startsWith("UNIRES")) if(strAuthority.startsWith("UNIRES_"+systemId))
uniRes.add(strAuthority); uniRes.add(strAuthority.substring(systemId.length()+8));
else if(strAuthority.startsWith("APPMENU")) else if(strAuthority.startsWith("APPMENU_"+systemId))
appMenu.add(strAuthority); appMenu.add(strAuthority.substring(systemId.length()+9));
} }
} }
appData.put("unires",uniRes); appData.put("unires",uniRes);
...@@ -57,4 +62,23 @@ public class AppController { ...@@ -57,4 +62,23 @@ public class AppController {
userDetailsService.resetByUsername(AuthenticationUser.getAuthenticationUser().getUsername()); userDetailsService.resetByUsername(AuthenticationUser.getAuthenticationUser().getUsername());
} }
} }
@Autowired
private IBZConfigService ibzConfigService;
@RequestMapping(method = RequestMethod.PUT, value = "/configs/{configType}/{targetType}")
public ResponseEntity<Boolean> saveConfig(@PathVariable("configType") String configType, @PathVariable("targetType") String targetType, @RequestBody JSONObject config) {
String userId=AuthenticationUser.getAuthenticationUser().getUserid();
if(StringUtils.isEmpty(userId))
throw new BadRequestAlertException("保存配置失败,参数缺失","IBZConfig",configType);
return ResponseEntity.ok(ibzConfigService.saveConfig(configType,targetType,userId,config));
}
@RequestMapping(method = RequestMethod.GET, value = "/configs/{configType}/{targetType}")
public ResponseEntity<JSONObject> getConfig(@PathVariable("configType") String configType, @PathVariable("targetType") String targetType) {
String userId=AuthenticationUser.getAuthenticationUser().getUserid();
if(StringUtils.isEmpty(userId))
throw new BadRequestAlertException("获取配置失败,参数缺失","IBZConfig",configType);
return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
}
} }
package cn.ibizlab.util.service;
import cn.ibizlab.util.domain.IBZConfig;
import cn.ibizlab.util.errors.BadRequestAlertException;
import cn.ibizlab.util.helper.DataObject;
import cn.ibizlab.util.mapper.IBZConfigMapper;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@Slf4j
@Service
public class IBZConfigService extends ServiceImpl<IBZConfigMapper, IBZConfig> implements IService<IBZConfig> {
@Value("${ibiz.systemid:ibzrt}")
private String systemId;
@Cacheable( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
public JSONObject getConfig(String cfgType,String targetType,String userId)
{
if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
throw new BadRequestAlertException("获取配置失败,参数缺失","IBZConfig",cfgType);
IBZConfig config=this.getOne(Wrappers.query(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).build()),false);
if(config==null)
return new JSONObject();
else
return JSON.parseObject(config.getCfg());
}
@CacheEvict( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
public boolean saveConfig(String cfgType,String targetType,String userId,JSONObject config)
{
if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
throw new BadRequestAlertException("保存配置失败,参数缺失","IBZConfig",cfgType);
String cfg="{}";
if(config!=null)
cfg=JSONObject.toJSONString(config);
return this.saveOrUpdate(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).cfg(cfg).updateDate(DataObject.getNow()).build());
}
@CacheEvict( value="ibzou_configs",key = "'cfgid:'+#p0+'||'+#p1+'||'+#p2")
public void resetConfig(String cfgType,String targetType,String userId)
{
if(StringUtils.isEmpty(userId)||StringUtils.isEmpty(cfgType)||StringUtils.isEmpty(targetType))
throw new BadRequestAlertException("重置配置失败,参数缺失","IBZConfig",cfgType);
this.remove(Wrappers.query(IBZConfig.builder().systemId(systemId).cfgType(cfgType).targetType(targetType).userId(userId).build()));
}
}
\ No newline at end of file
...@@ -85,3 +85,16 @@ ibiz: ...@@ -85,3 +85,16 @@ ibiz:
enablePermissionValid: true enablePermissionValid: true
cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存 cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
#xxl-job定时服务
xxl:
job:
accessToken:
admin:
addresses: #127.0.0.1
executor:
appname: ibzrt
ip:
port: 9999
logpath: /app/joblog
logretentiondays: -1
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册