Skip to content

I
ibzrt
提交 86d70e41 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 部署微服务应用

上级 6607f9fc
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 947 行增加 和 660 行删除
app_Web/CHANGELOG.md
浏览文件 @ 86d70e41
## 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]
### Bug修复
......
app_Web/src/components/context-menu/context-menu.less
浏览文件 @ 86d70e41
.context-menu-container {
// width: 100vw;
// height: 100vh;
// z-index: -10000;
// position: absolute;
// top: 0;
// left: 0;
line-height: 1;
// width: 100vw;
// height: 100vh;
// z-index: -10000;
// position: absolute;
// top: 0;
// left: 0;
// line-height: 1;
z-index: 10001;
.context-menu-content {
z-index: 10001;
position: absolute;
background: #FFF;
// border: 1px solid #e3e3e3;
}
.context-menu-content {
position: absolute;
background: #FFF;
// border: 1px solid #e3e3e3;
.ivu-divider{
width: 100%;
}
.context-menus {
}
.context-menus-item {
list-style: none;
line-height: 36px;
padding: 0 13px;
margin: 0;
font-size: 14px;
color: #606266;
cursor: pointer;
outline: none;
display: flex;
.icon {
display: flex;
justify-content: center;
align-items: center;
font-size: 16px;
width: 20px;
margin-right: 8px;
}
}
.context-menus-item:hover {
background-color: #ecf5ff;
color: #66b1ff;
}
}
.context-menus {
.context-menus-item {
list-style: none;
line-height: 36px;
padding: 0 13px;
margin: 0;
font-size: 14px;
color: #606266;
cursor: pointer;
outline: none;
display: flex;
.icon {
display: flex;
justify-content: center;
align-items: center;
font-size: 16px;
width: 20px;
margin-right: 8px;
}
}
.context-menus-item:hover {
background-color: #ecf5ff;
color: #66b1ff;
}
}
}
.context-menu {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
\ No newline at end of file
app_Web/src/locale/lanres/sys-role/sys-role_en_US.ts
浏览文件 @ 86d70e41
......@@ -67,8 +67,6 @@ export default {
details: {
formpage1: "Enable DataGrid Inline Row Edit Mode",
n_sys_rolename_like: "Save",
n_sys_rolename_isnotnull: "角色表名称(NotNil)",
n_sys_rolename_isnull: "角色表名称(Nil)",
},
uiactions: {
},
......
app_Web/src/locale/lanres/sys-role/sys-role_zh_CN.ts
浏览文件 @ 86d70e41
export default {
fields: {
roleid: '角色表标识',
rolename: '角色表名称',
roleid: '角色标识',
rolename: '角色名称',
memo: '备注',
createdate: '建立时间',
updatedate: '更新时间',
......@@ -39,23 +39,23 @@ export default {
formpage1: '基本信息',
srfupdatedate: '更新时间',
srforikey: '',
srfkey: '角色表标识',
srfmajortext: '角色表名称',
srfkey: '角色标识',
srfmajortext: '角色名称',
srftempmode: '',
srfuf: '',
srfdeid: '',
srfsourcekey: '',
sys_rolename: '角色表名称',
sys_rolename: '角色名称',
memo: '备注',
sys_roleid: '角色表标识',
sys_roleid: '角色标识',
},
uiactions: {
},
},
main_grid: {
columns: {
sys_roleid: '角色表标识',
sys_rolename: '角色表名称',
sys_roleid: '角色标识',
sys_rolename: '角色名称',
memo: '备注',
updatedate: '更新时间',
},
......@@ -65,9 +65,7 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_sys_rolename_like: '角色表名称(%)',
n_sys_rolename_isnotnull: '角色表名称(NotNil)',
n_sys_rolename_isnull: '角色表名称(Nil)',
n_sys_rolename_like: '角色名称(%)',
},
uiactions: {
},
......
app_Web/src/locale/lanres/sys-user-role/sys-user-role_en_US.ts
浏览文件 @ 86d70e41
......@@ -2,7 +2,7 @@
export default {
fields: {
userroleid: 'The major data entity cannot be found',
roleid: '角色表标识',
roleid: '角色标识',
rolename: '角色名称',
userid: '用户标识',
personname: '用户名称',
......@@ -31,7 +31,7 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
sys_roleid: "角色表标识",
sys_roleid: "角色标识",
sys_user_roleid: "The major data entity cannot be found",
sys_rolename: "角色名称",
sys_username: "用户名称",
......
app_Web/src/locale/lanres/sys-user-role/sys-user-role_zh_CN.ts
浏览文件 @ 86d70e41
export default {
fields: {
userroleid: '用户角色关系表标识',
roleid: '角色表标识',
userroleid: '用户角色关系标识',
roleid: '角色标识',
rolename: '角色名称',
userid: '用户标识',
personname: '用户名称',
......@@ -24,14 +24,14 @@ export default {
formpage1: '基本信息',
srfupdatedate: '更新时间',
srforikey: '',
srfkey: '用户角色关系表标识',
srfkey: '用户角色关系标识',
srfmajortext: '用户标识',
srftempmode: '',
srfuf: '',
srfdeid: '',
srfsourcekey: '',
sys_roleid: '角色表标识',
sys_user_roleid: '用户角色关系表标识',
sys_roleid: '角色标识',
sys_user_roleid: '用户角色关系标识',
sys_rolename: '角色名称',
sys_username: '用户名称',
sys_userid: '用户标识',
......
app_Web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
浏览文件 @ 86d70e41
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<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='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_Web/src/styles/default.less
浏览文件 @ 86d70e41
......@@ -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{
>.ivu-card-body{
height: 100%;
......
app_Web/src/widgets/ibzdepartment/dept-tree-treeview/dept-tree-treeview.less
浏览文件 @ 86d70e41
......@@ -29,5 +29,8 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
.icon{
padding-right: 10px;
}
}
// this is less
app_Web/src/widgets/ibzorganization/org-tree-treeview/org-tree-treeview.less
浏览文件 @ 86d70e41
......@@ -29,5 +29,8 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
.icon{
padding-right: 10px;
}
}
// this is less
app_Web/src/widgets/sys-role/default-searchform/default-searchform-base.vue
浏览文件 @ 86d70e41
......@@ -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>
</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>
</row>
</i-col>
......@@ -263,8 +251,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public data: any = {
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 {
*/
public rules: any = {
n_sys_rolename_like: [
{ type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称(%) 值不能为空', trigger: 'change' },
{ 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' },
{ type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色名称(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称(%) 值不能为空', trigger: 'blur' },
],
}
......@@ -303,11 +277,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
public detailsModel: any = {
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_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 })
n_sys_rolename_like: new FormItemModel({ caption: '角色名称(%)', detailType: 'FORMITEM', name: 'n_sys_rolename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
......@@ -323,30 +293,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
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 {
}
/**
......
app_Web/src/widgets/sys-role/default-searchform/default-searchform-model.ts
浏览文件 @ 86d70e41
......@@ -30,16 +30,6 @@ export default class DefaultModel {
prop: 'rolename',
dataType: 'TEXT',
},
{
name: 'n_sys_rolename_isnotnull',
prop: 'rolename',
dataType: 'TEXT',
},
{
name: 'n_sys_rolename_isnull',
prop: 'rolename',
dataType: 'TEXT',
},
]
}
......
app_Web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @ 86d70e41
......@@ -464,16 +464,16 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfkey: [
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'blur' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
],
srftempmode: [
{ type: 'string', message: ' 值必须为字符串类型', trigger: 'change' },
......@@ -500,10 +500,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
sys_rolename: [
{ type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表名称 值不能为空', trigger: 'blur' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
],
memo: [
{ type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' },
......@@ -512,10 +512,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
],
sys_roleid: [
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
],
}
......@@ -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 })
,
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 })
,
......@@ -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 })
,
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 })
,
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 })
,
};
......
app_Web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @ 86d70e41
......@@ -536,14 +536,14 @@ export default class MainBase extends Vue implements ControlInterface {
public allColumns: any[] = [
{
name: 'sys_roleid',
label: '角色表标识',
label: '角色标识',
langtag: 'entities.sysrole.main_grid.columns.sys_roleid',
show: true,
util: 'PX'
},
{
name: 'sys_rolename',
label: '角色表名称',
label: '角色名称',
langtag: 'entities.sysrole.main_grid.columns.sys_rolename',
show: true,
util: 'PX'
......@@ -592,8 +592,8 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public rules: any = {
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: 'blur' },
{ 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' },
],
}
......
app_Web/src/widgets/sys-role/main-grid/main-grid-model.ts
浏览文件 @ 86d70e41
......@@ -70,16 +70,6 @@ export default class MainModel {
prop: 'n_sys_rolename_like',
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',
......
app_Web/src/widgets/sys-user-role/main-form/main-form-base.vue
浏览文件 @ 86d70e41
......@@ -440,10 +440,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfkey: [
{ type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '用户标识 值必须为字符串类型', trigger: 'change' },
......@@ -476,16 +476,16 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
sys_roleid: [
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色表标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色表标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
],
sys_user_roleid: [
{ type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系表标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系表标识 值不能为空', trigger: 'blur' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户角色关系标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户角色关系标识 值不能为空', trigger: 'blur' },
],
sys_rolename: [
{ type: 'string', message: '角色名称 值必须为字符串类型', trigger: 'change' },
......@@ -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 })
,
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 })
,
......@@ -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 })
,
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 })
,
......
app_Web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @ 86d70e41
......@@ -587,8 +587,8 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public rules: any = {
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: 'blur' },
{ 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' },
],
}
......
config.xml
浏览文件 @ 86d70e41
......@@ -37,6 +37,11 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
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>
</hudson.tasks.Shell>
</builders>
......
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @ 86d70e41
......@@ -2,13 +2,13 @@
FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBZ_SLEEP=0 \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
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
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @ 86d70e41
......@@ -3,9 +3,21 @@ services:
ibzrt-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports:
- "8080:8080"
- "30000:30000"
networks:
- 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:
mode: replicated
replicas: 1
......
ibzrt-boot/src/main/java/cn/ibizlab/config/DevBootSecurityConfig.java
浏览文件 @ 86d70e41
......@@ -101,7 +101,10 @@ public class DevBootSecurityConfig extends WebSecurityConfigurerAdapter {
"/**/fonts/**",
"/**/js/**",
"/**/img/**",
"/"
"/",
"webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll()
//放行登录请求
.antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
浏览文件 @ 86d70e41
......@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient;
public class SysRole extends EntityClient implements Serializable {
/**
* 角色表标识
* 角色标识
*/
@DEField(name = "sys_roleid" , isKeyField=true)
@JSONField(name = "roleid")
......@@ -38,7 +38,7 @@ public class SysRole extends EntityClient implements Serializable {
private String roleid;
/**
* 角色表名称
* 角色名称
*/
@DEField(name = "sys_rolename")
@JSONField(name = "rolename")
......@@ -75,7 +75,7 @@ public class SysRole extends EntityClient implements Serializable {
/**
* 设置 [角色表名称]
* 设置 [角色名称]
*/
public void setRolename(String rolename){
this.rolename = rolename ;
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java
浏览文件 @ 86d70e41
......@@ -30,7 +30,7 @@ import cn.ibizlab.util.domain.EntityClient;
public class SysUserRole extends EntityClient implements Serializable {
/**
* 用户角色关系表标识
* 用户角色关系标识
*/
@DEField(name = "sys_user_roleid" , isKeyField=true)
@JSONField(name = "userroleid")
......@@ -38,7 +38,7 @@ public class SysUserRole extends EntityClient implements Serializable {
private String userroleid;
/**
* 角色表标识
* 角色标识
*/
@DEField(name = "sys_roleid")
@JSONField(name = "roleid")
......@@ -104,7 +104,7 @@ public class SysUserRole extends EntityClient implements Serializable {
/**
* 设置 [角色表标识]
* 设置 [角色标识]
*/
public void setRoleid(String roleid){
this.roleid = roleid ;
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java
浏览文件 @ 86d70e41
......@@ -25,11 +25,11 @@ import cn.ibizlab.util.filter.SearchContextBase;
@Slf4j
@Data
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;//[角色名称]
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java
浏览文件 @ 86d70e41
......@@ -25,7 +25,7 @@ import cn.ibizlab.util.filter.SearchContextBase;
@Slf4j
@Data
public class SysUserRoleSearchContext extends SearchContextBase {
private String n_sys_roleid_eq;//[角色表标识]
private String n_sys_roleid_eq;//[角色标识]
private String n_sys_userid_eq;//[用户标识]
......
ibzrt-core/src/main/java/cn/ibizlab/core/util/config/XxlJobConfig.java 0 → 100644
浏览文件 @ 86d70e41
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();
*/
}
ibzrt-dependencies/pom.xml
浏览文件 @ 86d70e41
......@@ -74,6 +74,9 @@
<!--httpClient -->
<openfeign-httpclient.version>11.0</openfeign-httpclient.version>
<!--xxl-job定时服务 -->
<xxl-job.version>2.1.0</xxl-job.version>
</properties>
<dependencyManagement>
......@@ -249,6 +252,12 @@
<version>${openfeign-httpclient.version}</version>
</dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -308,6 +317,12 @@
<artifactId>h2</artifactId>
</dependency>
<!--xxl-job定时服务 -->
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
</dependency>
<!-- Error -->
<!-- Security -->
......
ibzrt-provider/ibzrt-provider-api/src/main/docker/Dockerfile
浏览文件 @ 86d70e41
......@@ -2,11 +2,11 @@
FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBZ_SLEEP=0 \
IBIZ_SLEEP=0 \
JAVA_OPTS=""
CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-provider-api.jar
EXPOSE 8081
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/config/apiSecurityConfig.java
浏览文件 @ 86d70e41
......@@ -106,7 +106,10 @@ public class apiSecurityConfig extends WebSecurityConfigurerAdapter {
"/**/fonts/**",
"/**/js/**",
"/**/img/**",
"/"
"/",
"webjars/**",
"/swagger-resources/**",
"/v2/**"
).permitAll()
//放行登录请求
.antMatchers( HttpMethod.POST,"/"+loginPath).permitAll()
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/IBZOrganizationResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.ou.service.IIBZOrganizationService;
import cn.ibizlab.core.ou.filter.IBZOrganizationSearchContext;
@Slf4j
@Api(tags = {"IBZOrganization" })
@Api(tags = {"单位机构" })
@RestController("api-ibzorganization")
@RequestMapping("")
public class IBZOrganizationResource {
......@@ -46,26 +46,26 @@ public class IBZOrganizationResource {
@Lazy
public IBZOrganizationMapping ibzorganizationMapping;
@ApiOperation(value = "Save", tags = {"IBZOrganization" }, notes = "Save")
@ApiOperation(value = "保存单位机构", tags = {"单位机构" }, notes = "保存单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations/save")
public ResponseEntity<Boolean> save(@RequestBody IBZOrganizationDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.saveBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
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")
public ResponseEntity<Boolean> checkKey(@RequestBody IBZOrganizationDTO 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}")
public ResponseEntity<IBZOrganizationDTO> get(@PathVariable("ibzorganization_id") String ibzorganization_id) {
IBZOrganization domain = ibzorganizationService.get(ibzorganization_id);
......@@ -73,7 +73,7 @@ public class IBZOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "Create", tags = {"IBZOrganization" }, notes = "Create")
@ApiOperation(value = "新建单位机构", tags = {"单位机构" }, notes = "新建单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/ibzorganizations")
public ResponseEntity<IBZOrganizationDTO> create(@RequestBody IBZOrganizationDTO ibzorganizationdto) {
......@@ -83,34 +83,34 @@ public class IBZOrganizationResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.createBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
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}")
public ResponseEntity<Boolean> remove(@PathVariable("ibzorganization_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
ibzorganizationService.removeBatch(ids);
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")
public ResponseEntity<IBZOrganizationDTO> getDraft() {
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}")
public ResponseEntity<IBZOrganizationDTO> update(@PathVariable("ibzorganization_id") String ibzorganization_id, @RequestBody IBZOrganizationDTO ibzorganizationdto) {
......@@ -121,14 +121,14 @@ public class IBZOrganizationResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<IBZOrganizationDTO> ibzorganizationdtos) {
ibzorganizationService.updateBatch(ibzorganizationMapping.toDomain(ibzorganizationdtos));
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")
public ResponseEntity<List<IBZOrganizationDTO>> fetchDefault(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
......@@ -140,14 +140,14 @@ public class IBZOrganizationResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"IBZOrganization" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"单位机构" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchdefault")
public ResponseEntity<Page<IBZOrganizationDTO>> searchDefault(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchDefault(context) ;
return ResponseEntity.status(HttpStatus.OK)
.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")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectPOrg(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ;
......@@ -159,14 +159,14 @@ public class IBZOrganizationResource {
.body(list);
}
@ApiOperation(value = "search查询上级单位", tags = {"IBZOrganization" } ,notes = "search查询上级单位")
@ApiOperation(value = "查询查询上级单位", tags = {"单位机构" } ,notes = "查询查询上级单位")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectporg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectPOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectPOrg(context) ;
return ResponseEntity.status(HttpStatus.OK)
.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")
public ResponseEntity<List<IBZOrganizationDTO>> fetchSelectSOrg(IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ;
......@@ -178,7 +178,7 @@ public class IBZOrganizationResource {
.body(list);
}
@ApiOperation(value = "search查询下级单位", tags = {"IBZOrganization" } ,notes = "search查询下级单位")
@ApiOperation(value = "查询查询下级单位", tags = {"单位机构" } ,notes = "查询查询下级单位")
@RequestMapping(method= RequestMethod.POST , value="/ibzorganizations/searchselectsorg")
public ResponseEntity<Page<IBZOrganizationDTO>> searchSelectSOrg(@RequestBody IBZOrganizationSearchContext context) {
Page<IBZOrganization> domains = ibzorganizationService.searchSelectSOrg(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SysAuthLogResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysAuthLogService;
import cn.ibizlab.core.uaa.filter.SysAuthLogSearchContext;
@Slf4j
@Api(tags = {"SysAuthLog" })
@Api(tags = {"认证日志" })
@RestController("api-sysauthlog")
@RequestMapping("")
public class SysAuthLogResource {
......@@ -46,33 +46,33 @@ public class SysAuthLogResource {
@Lazy
public SysAuthLogMapping sysauthlogMapping;
@ApiOperation(value = "CheckKey", tags = {"SysAuthLog" }, notes = "CheckKey")
@ApiOperation(value = "检查认证日志", tags = {"认证日志" }, notes = "检查认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SysAuthLogDTO 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}")
public ResponseEntity<Boolean> remove(@PathVariable("sysauthlog_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysauthlogService.removeBatch(ids);
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")
public ResponseEntity<SysAuthLogDTO> getDraft() {
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}")
public ResponseEntity<SysAuthLogDTO> update(@PathVariable("sysauthlog_id") String sysauthlog_id, @RequestBody SysAuthLogDTO sysauthlogdto) {
......@@ -83,27 +83,27 @@ public class SysAuthLogResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.updateBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
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")
public ResponseEntity<Boolean> save(@RequestBody SysAuthLogDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.saveBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "Create", tags = {"SysAuthLog" }, notes = "Create")
@ApiOperation(value = "新建认证日志", tags = {"认证日志" }, notes = "新建认证日志")
@RequestMapping(method = RequestMethod.POST, value = "/sysauthlogs")
public ResponseEntity<SysAuthLogDTO> create(@RequestBody SysAuthLogDTO sysauthlogdto) {
......@@ -113,14 +113,14 @@ public class SysAuthLogResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysAuthLogDTO> sysauthlogdtos) {
sysauthlogService.createBatch(sysauthlogMapping.toDomain(sysauthlogdtos));
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}")
public ResponseEntity<SysAuthLogDTO> get(@PathVariable("sysauthlog_id") String sysauthlog_id) {
SysAuthLog domain = sysauthlogService.get(sysauthlog_id);
......@@ -128,7 +128,7 @@ public class SysAuthLogResource {
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")
public ResponseEntity<List<SysAuthLogDTO>> fetchDefault(SysAuthLogSearchContext context) {
Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class SysAuthLogResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"SysAuthLog" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"认证日志" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysauthlogs/searchdefault")
public ResponseEntity<Page<SysAuthLogDTO>> searchDefault(@RequestBody SysAuthLogSearchContext context) {
Page<SysAuthLog> domains = sysauthlogService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SysPermissionResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysPermissionService;
import cn.ibizlab.core.uaa.filter.SysPermissionSearchContext;
@Slf4j
@Api(tags = {"SysPermission" })
@Api(tags = {"权限/资源" })
@RestController("api-syspermission")
@RequestMapping("")
public class SysPermissionResource {
......@@ -46,40 +46,40 @@ public class SysPermissionResource {
@Lazy
public SysPermissionMapping syspermissionMapping;
@ApiOperation(value = "Save", tags = {"SysPermission" }, notes = "Save")
@ApiOperation(value = "保存权限/资源", tags = {"权限/资源" }, notes = "保存权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions/save")
public ResponseEntity<Boolean> save(@RequestBody SysPermissionDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.saveBatch(syspermissionMapping.toDomain(syspermissiondtos));
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")
public ResponseEntity<SysPermissionDTO> getDraft() {
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}")
public ResponseEntity<Boolean> remove(@PathVariable("syspermission_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
syspermissionService.removeBatch(ids);
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}")
public ResponseEntity<SysPermissionDTO> update(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysPermissionDTO syspermissiondto) {
......@@ -90,14 +90,14 @@ public class SysPermissionResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.updateBatch(syspermissionMapping.toDomain(syspermissiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "Create", tags = {"SysPermission" }, notes = "Create")
@ApiOperation(value = "新建权限/资源", tags = {"权限/资源" }, notes = "新建权限/资源")
@RequestMapping(method = RequestMethod.POST, value = "/syspermissions")
public ResponseEntity<SysPermissionDTO> create(@RequestBody SysPermissionDTO syspermissiondto) {
......@@ -107,20 +107,20 @@ public class SysPermissionResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysPermissionDTO> syspermissiondtos) {
syspermissionService.createBatch(syspermissionMapping.toDomain(syspermissiondtos));
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")
public ResponseEntity<Boolean> checkKey(@RequestBody SysPermissionDTO 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}")
public ResponseEntity<SysPermissionDTO> get(@PathVariable("syspermission_id") String syspermission_id) {
SysPermission domain = syspermissionService.get(syspermission_id);
......@@ -128,7 +128,7 @@ public class SysPermissionResource {
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")
public ResponseEntity<List<SysPermissionDTO>> fetchDefault(SysPermissionSearchContext context) {
Page<SysPermission> domains = syspermissionService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class SysPermissionResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"SysPermission" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"权限/资源" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/syspermissions/searchdefault")
public ResponseEntity<Page<SysPermissionDTO>> searchDefault(@RequestBody SysPermissionSearchContext context) {
Page<SysPermission> domains = syspermissionService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SysRoleResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysRoleService;
import cn.ibizlab.core.uaa.filter.SysRoleSearchContext;
@Slf4j
@Api(tags = {"SysRole" })
@Api(tags = {"系统角色" })
@RestController("api-sysrole")
@RequestMapping("")
public class SysRoleResource {
......@@ -46,20 +46,20 @@ public class SysRoleResource {
@Lazy
public SysRoleMapping sysroleMapping;
@ApiOperation(value = "Save", tags = {"SysRole" }, notes = "Save")
@ApiOperation(value = "保存系统角色", tags = {"系统角色" }, notes = "保存系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles/save")
public ResponseEntity<Boolean> save(@RequestBody SysRoleDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.saveBatch(sysroleMapping.toDomain(sysroledtos));
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}")
public ResponseEntity<SysRoleDTO> update(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRoleDTO sysroledto) {
......@@ -70,14 +70,14 @@ public class SysRoleResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.updateBatch(sysroleMapping.toDomain(sysroledtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "Create", tags = {"SysRole" }, notes = "Create")
@ApiOperation(value = "新建系统角色", tags = {"系统角色" }, notes = "新建系统角色")
@RequestMapping(method = RequestMethod.POST, value = "/sysroles")
public ResponseEntity<SysRoleDTO> create(@RequestBody SysRoleDTO sysroledto) {
......@@ -87,14 +87,14 @@ public class SysRoleResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysRoleDTO> sysroledtos) {
sysroleService.createBatch(sysroleMapping.toDomain(sysroledtos));
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}")
public ResponseEntity<SysRoleDTO> get(@PathVariable("sysrole_id") String sysrole_id) {
SysRole domain = sysroleService.get(sysrole_id);
......@@ -102,33 +102,33 @@ public class SysRoleResource {
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}")
public ResponseEntity<Boolean> remove(@PathVariable("sysrole_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysroleService.removeBatch(ids);
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")
public ResponseEntity<SysRoleDTO> getDraft() {
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")
public ResponseEntity<Boolean> checkKey(@RequestBody SysRoleDTO 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")
public ResponseEntity<List<SysRoleDTO>> fetchDefault(SysRoleSearchContext context) {
Page<SysRole> domains = sysroleService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class SysRoleResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"SysRole" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"系统角色" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysroles/searchdefault")
public ResponseEntity<Page<SysRoleDTO>> searchDefault(@RequestBody SysRoleSearchContext context) {
Page<SysRole> domains = sysroleService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/SysUserResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.uaa.service.ISysUserService;
import cn.ibizlab.core.uaa.filter.SysUserSearchContext;
@Slf4j
@Api(tags = {"SysUser" })
@Api(tags = {"系统用户" })
@RestController("api-sysuser")
@RequestMapping("")
public class SysUserResource {
......@@ -46,21 +46,21 @@ public class SysUserResource {
@Lazy
public SysUserMapping sysuserMapping;
@ApiOperation(value = "Remove", tags = {"SysUser" }, notes = "Remove")
@ApiOperation(value = "删除系统用户", tags = {"系统用户" }, notes = "删除系统用户")
@RequestMapping(method = RequestMethod.DELETE, value = "/sysusers/{sysuser_id}")
public ResponseEntity<Boolean> remove(@PathVariable("sysuser_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
sysuserService.removeBatch(ids);
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}")
public ResponseEntity<SysUserDTO> update(@PathVariable("sysuser_id") String sysuser_id, @RequestBody SysUserDTO sysuserdto) {
......@@ -71,20 +71,20 @@ public class SysUserResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.updateBatch(sysuserMapping.toDomain(sysuserdtos));
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")
public ResponseEntity<Boolean> checkKey(@RequestBody SysUserDTO 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}")
public ResponseEntity<SysUserDTO> get(@PathVariable("sysuser_id") String sysuser_id) {
SysUser domain = sysuserService.get(sysuser_id);
......@@ -92,26 +92,26 @@ public class SysUserResource {
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")
public ResponseEntity<Boolean> save(@RequestBody SysUserDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.saveBatch(sysuserMapping.toDomain(sysuserdtos));
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")
public ResponseEntity<SysUserDTO> getDraft() {
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")
public ResponseEntity<SysUserDTO> create(@RequestBody SysUserDTO sysuserdto) {
......@@ -121,14 +121,14 @@ public class SysUserResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SysUserDTO> sysuserdtos) {
sysuserService.createBatch(sysuserMapping.toDomain(sysuserdtos));
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")
public ResponseEntity<List<SysUserDTO>> fetchDefault(SysUserSearchContext context) {
Page<SysUser> domains = sysuserService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class SysUserResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"SysUser" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"系统用户" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysusers/searchdefault")
public ResponseEntity<Page<SysUserDTO>> searchDefault(@RequestBody SysUserSearchContext context) {
Page<SysUser> domains = sysuserService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFGroupResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFGroupService;
import cn.ibizlab.core.workflow.filter.WFGroupSearchContext;
@Slf4j
@Api(tags = {"WFGroup" })
@Api(tags = {"角色/用户组" })
@RestController("api-wfgroup")
@RequestMapping("")
public class WFGroupResource {
......@@ -46,34 +46,34 @@ public class WFGroupResource {
@Lazy
public WFGroupMapping wfgroupMapping;
@ApiOperation(value = "Remove", tags = {"WFGroup" }, notes = "Remove")
@ApiOperation(value = "删除角色/用户组", tags = {"角色/用户组" }, notes = "删除角色/用户组")
@RequestMapping(method = RequestMethod.DELETE, value = "/wfgroups/{wfgroup_id}")
public ResponseEntity<Boolean> remove(@PathVariable("wfgroup_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfgroupService.removeBatch(ids);
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")
public ResponseEntity<Boolean> save(@RequestBody WFGroupDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.saveBatch(wfgroupMapping.toDomain(wfgroupdtos));
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}")
public ResponseEntity<WFGroupDTO> get(@PathVariable("wfgroup_id") String wfgroup_id) {
WFGroup domain = wfgroupService.get(wfgroup_id);
......@@ -81,7 +81,7 @@ public class WFGroupResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "Create", tags = {"WFGroup" }, notes = "Create")
@ApiOperation(value = "新建角色/用户组", tags = {"角色/用户组" }, notes = "新建角色/用户组")
@RequestMapping(method = RequestMethod.POST, value = "/wfgroups")
public ResponseEntity<WFGroupDTO> create(@RequestBody WFGroupDTO wfgroupdto) {
......@@ -91,26 +91,26 @@ public class WFGroupResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.createBatch(wfgroupMapping.toDomain(wfgroupdtos));
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")
public ResponseEntity<WFGroupDTO> getDraft() {
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")
public ResponseEntity<Boolean> checkKey(@RequestBody WFGroupDTO 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}")
public ResponseEntity<WFGroupDTO> update(@PathVariable("wfgroup_id") String wfgroup_id, @RequestBody WFGroupDTO wfgroupdto) {
......@@ -121,14 +121,14 @@ public class WFGroupResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFGroupDTO> wfgroupdtos) {
wfgroupService.updateBatch(wfgroupMapping.toDomain(wfgroupdtos));
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")
public ResponseEntity<List<WFGroupDTO>> fetchDefault(WFGroupSearchContext context) {
Page<WFGroup> domains = wfgroupService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class WFGroupResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"WFGroup" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"角色/用户组" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfgroups/searchdefault")
public ResponseEntity<Page<WFGroupDTO>> searchDefault(@RequestBody WFGroupSearchContext context) {
Page<WFGroup> domains = wfgroupService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessDefinitionResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFProcessDefinitionService;
import cn.ibizlab.core.workflow.filter.WFProcessDefinitionSearchContext;
@Slf4j
@Api(tags = {"WFProcessDefinition" })
@Api(tags = {"流程定义" })
@RestController("api-wfprocessdefinition")
@RequestMapping("")
public class WFProcessDefinitionResource {
......@@ -46,40 +46,40 @@ public class WFProcessDefinitionResource {
@Lazy
public WFProcessDefinitionMapping wfprocessdefinitionMapping;
@ApiOperation(value = "CheckKey", tags = {"WFProcessDefinition" }, notes = "CheckKey")
@ApiOperation(value = "检查流程定义", tags = {"流程定义" }, notes = "检查流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody WFProcessDefinitionDTO 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}")
public ResponseEntity<Boolean> remove(@PathVariable("wfprocessdefinition_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfprocessdefinitionService.removeBatch(ids);
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")
public ResponseEntity<Boolean> save(@RequestBody WFProcessDefinitionDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.saveBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@ApiOperation(value = "Create", tags = {"WFProcessDefinition" }, notes = "Create")
@ApiOperation(value = "新建流程定义", tags = {"流程定义" }, notes = "新建流程定义")
@RequestMapping(method = RequestMethod.POST, value = "/wfprocessdefinitions")
public ResponseEntity<WFProcessDefinitionDTO> create(@RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
......@@ -89,20 +89,20 @@ public class WFProcessDefinitionResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.createBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
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")
public ResponseEntity<WFProcessDefinitionDTO> getDraft() {
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}")
public ResponseEntity<WFProcessDefinitionDTO> update(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id, @RequestBody WFProcessDefinitionDTO wfprocessdefinitiondto) {
......@@ -113,14 +113,14 @@ public class WFProcessDefinitionResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFProcessDefinitionDTO> wfprocessdefinitiondtos) {
wfprocessdefinitionService.updateBatch(wfprocessdefinitionMapping.toDomain(wfprocessdefinitiondtos));
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}")
public ResponseEntity<WFProcessDefinitionDTO> get(@PathVariable("wfprocessdefinition_id") String wfprocessdefinition_id) {
WFProcessDefinition domain = wfprocessdefinitionService.get(wfprocessdefinition_id);
......@@ -128,7 +128,7 @@ public class WFProcessDefinitionResource {
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")
public ResponseEntity<List<WFProcessDefinitionDTO>> fetchDefault(WFProcessDefinitionSearchContext context) {
Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class WFProcessDefinitionResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"WFProcessDefinition" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"流程定义" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfprocessdefinitions/searchdefault")
public ResponseEntity<Page<WFProcessDefinitionDTO>> searchDefault(@RequestBody WFProcessDefinitionSearchContext context) {
Page<WFProcessDefinition> domains = wfprocessdefinitionService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFREModelResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFREModelService;
import cn.ibizlab.core.workflow.filter.WFREModelSearchContext;
@Slf4j
@Api(tags = {"WFREModel" })
@Api(tags = {"流程模型" })
@RestController("api-wfremodel")
@RequestMapping("")
public class WFREModelResource {
......@@ -46,7 +46,7 @@ public class WFREModelResource {
@Lazy
public WFREModelMapping wfremodelMapping;
@ApiOperation(value = "Create", tags = {"WFREModel" }, notes = "Create")
@ApiOperation(value = "新建流程模型", tags = {"流程模型" }, notes = "新建流程模型")
@RequestMapping(method = RequestMethod.POST, value = "/wfremodels")
public ResponseEntity<WFREModelDTO> create(@RequestBody WFREModelDTO wfremodeldto) {
......@@ -56,14 +56,14 @@ public class WFREModelResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.createBatch(wfremodelMapping.toDomain(wfremodeldtos));
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}")
public ResponseEntity<WFREModelDTO> get(@PathVariable("wfremodel_id") String wfremodel_id) {
WFREModel domain = wfremodelService.get(wfremodel_id);
......@@ -71,20 +71,20 @@ public class WFREModelResource {
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")
public ResponseEntity<Boolean> save(@RequestBody WFREModelDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.saveBatch(wfremodelMapping.toDomain(wfremodeldtos));
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}")
public ResponseEntity<WFREModelDTO> update(@PathVariable("wfremodel_id") String wfremodel_id, @RequestBody WFREModelDTO wfremodeldto) {
......@@ -95,40 +95,40 @@ public class WFREModelResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFREModelDTO> wfremodeldtos) {
wfremodelService.updateBatch(wfremodelMapping.toDomain(wfremodeldtos));
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")
public ResponseEntity<WFREModelDTO> getDraft() {
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}")
public ResponseEntity<Boolean> remove(@PathVariable("wfremodel_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfremodelService.removeBatch(ids);
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")
public ResponseEntity<Boolean> checkKey(@RequestBody WFREModelDTO 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")
public ResponseEntity<List<WFREModelDTO>> fetchDefault(WFREModelSearchContext context) {
Page<WFREModel> domains = wfremodelService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class WFREModelResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"WFREModel" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"流程模型" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfremodels/searchdefault")
public ResponseEntity<Page<WFREModelDTO>> searchDefault(@RequestBody WFREModelSearchContext context) {
Page<WFREModel> domains = wfremodelService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFSystemResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFSystemService;
import cn.ibizlab.core.workflow.filter.WFSystemSearchContext;
@Slf4j
@Api(tags = {"WFSystem" })
@Api(tags = {"系统" })
@RestController("api-wfsystem")
@RequestMapping("")
public class WFSystemResource {
......@@ -46,34 +46,34 @@ public class WFSystemResource {
@Lazy
public WFSystemMapping wfsystemMapping;
@ApiOperation(value = "Save", tags = {"WFSystem" }, notes = "Save")
@ApiOperation(value = "保存系统", tags = {"系统" }, notes = "保存系统")
@RequestMapping(method = RequestMethod.POST, value = "/wfsystems/save")
public ResponseEntity<Boolean> save(@RequestBody WFSystemDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.saveBatch(wfsystemMapping.toDomain(wfsystemdtos));
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}")
public ResponseEntity<Boolean> remove(@PathVariable("wfsystem_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfsystemService.removeBatch(ids);
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}")
public ResponseEntity<WFSystemDTO> get(@PathVariable("wfsystem_id") String wfsystem_id) {
WFSystem domain = wfsystemService.get(wfsystem_id);
......@@ -81,13 +81,13 @@ public class WFSystemResource {
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")
public ResponseEntity<WFSystemDTO> getDraft() {
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")
public ResponseEntity<WFSystemDTO> create(@RequestBody WFSystemDTO wfsystemdto) {
......@@ -97,20 +97,20 @@ public class WFSystemResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.createBatch(wfsystemMapping.toDomain(wfsystemdtos));
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")
public ResponseEntity<Boolean> checkKey(@RequestBody WFSystemDTO 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}")
public ResponseEntity<WFSystemDTO> update(@PathVariable("wfsystem_id") String wfsystem_id, @RequestBody WFSystemDTO wfsystemdto) {
......@@ -121,14 +121,14 @@ public class WFSystemResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFSystemDTO> wfsystemdtos) {
wfsystemService.updateBatch(wfsystemMapping.toDomain(wfsystemdtos));
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")
public ResponseEntity<List<WFSystemDTO>> fetchDefault(WFSystemSearchContext context) {
Page<WFSystem> domains = wfsystemService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class WFSystemResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"WFSystem" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"系统" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfsystems/searchdefault")
public ResponseEntity<Page<WFSystemDTO>> searchDefault(@RequestBody WFSystemSearchContext context) {
Page<WFSystem> domains = wfsystemService.searchDefault(context) ;
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/rest/WFUserResource.java
浏览文件 @ 86d70e41
......@@ -34,7 +34,7 @@ import cn.ibizlab.core.workflow.service.IWFUserService;
import cn.ibizlab.core.workflow.filter.WFUserSearchContext;
@Slf4j
@Api(tags = {"WFUser" })
@Api(tags = {"用户" })
@RestController("api-wfuser")
@RequestMapping("")
public class WFUserResource {
......@@ -46,7 +46,7 @@ public class WFUserResource {
@Lazy
public WFUserMapping wfuserMapping;
@ApiOperation(value = "Update", tags = {"WFUser" }, notes = "Update")
@ApiOperation(value = "更新用户", tags = {"用户" }, notes = "更新用户")
@RequestMapping(method = RequestMethod.PUT, value = "/wfusers/{wfuser_id}")
public ResponseEntity<WFUserDTO> update(@PathVariable("wfuser_id") String wfuser_id, @RequestBody WFUserDTO wfuserdto) {
......@@ -57,20 +57,20 @@ public class WFUserResource {
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")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.updateBatch(wfuserMapping.toDomain(wfuserdtos));
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")
public ResponseEntity<WFUserDTO> getDraft() {
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}")
public ResponseEntity<WFUserDTO> get(@PathVariable("wfuser_id") String wfuser_id) {
WFUser domain = wfuserService.get(wfuser_id);
......@@ -78,7 +78,7 @@ public class WFUserResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@ApiOperation(value = "Create", tags = {"WFUser" }, notes = "Create")
@ApiOperation(value = "新建用户", tags = {"用户" }, notes = "新建用户")
@RequestMapping(method = RequestMethod.POST, value = "/wfusers")
public ResponseEntity<WFUserDTO> create(@RequestBody WFUserDTO wfuserdto) {
......@@ -88,47 +88,47 @@ public class WFUserResource {
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")
public ResponseEntity<Boolean> createBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.createBatch(wfuserMapping.toDomain(wfuserdtos));
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")
public ResponseEntity<Boolean> checkKey(@RequestBody WFUserDTO 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")
public ResponseEntity<Boolean> save(@RequestBody WFUserDTO 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")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<WFUserDTO> wfuserdtos) {
wfuserService.saveBatch(wfuserMapping.toDomain(wfuserdtos));
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}")
public ResponseEntity<Boolean> remove(@PathVariable("wfuser_id") String 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")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
wfuserService.removeBatch(ids);
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")
public ResponseEntity<List<WFUserDTO>> fetchDefault(WFUserSearchContext context) {
Page<WFUser> domains = wfuserService.searchDefault(context) ;
......@@ -140,7 +140,7 @@ public class WFUserResource {
.body(list);
}
@ApiOperation(value = "searchDEFAULT", tags = {"WFUser" } ,notes = "searchDEFAULT")
@ApiOperation(value = "查询DEFAULT", tags = {"用户" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/wfusers/searchdefault")
public ResponseEntity<Page<WFUserDTO>> searchDefault(@RequestBody WFUserSearchContext context) {
Page<WFUser> domains = wfuserService.searchDefault(context) ;
......
ibzrt-util/src/main/java/cn/ibizlab/util/domain/IBZConfig.java 0 → 100644
浏览文件 @ 86d70e41
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;
}
}
ibzrt-util/src/main/java/cn/ibizlab/util/mapper/IBZConfigMapper.java 0 → 100644
浏览文件 @ 86d70e41
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
ibzrt-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @ 86d70e41
package cn.ibizlab.util.rest;
import cn.ibizlab.util.errors.BadRequestAlertException;
import cn.ibizlab.util.service.IBZConfigService;
import com.alibaba.fastjson.JSONObject;
import cn.ibizlab.util.security.AuthenticationUser;
import cn.ibizlab.util.service.AuthenticationUserService;
......@@ -8,9 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
......@@ -23,6 +24,10 @@ public class AppController {
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:ibzrt}")
private String systemId;
@Autowired
private AuthenticationUserService userDetailsService;
......@@ -39,10 +44,10 @@ public class AppController {
while(it.hasNext()) {
GrantedAuthority authority = (GrantedAuthority)it.next();
String strAuthority=authority.getAuthority();
if(strAuthority.startsWith("UNIRES"))
uniRes.add(strAuthority);
else if(strAuthority.startsWith("APPMENU"))
appMenu.add(strAuthority);
if(strAuthority.startsWith("UNIRES_"+systemId))
uniRes.add(strAuthority.substring(systemId.length()+8));
else if(strAuthority.startsWith("APPMENU_"+systemId))
appMenu.add(strAuthority.substring(systemId.length()+9));
}
}
appData.put("unires",uniRes);
......@@ -57,4 +62,23 @@ public class AppController {
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));
}
}
ibzrt-util/src/main/java/cn/ibizlab/util/service/IBZConfigService.java 0 → 100644
浏览文件 @ 86d70e41
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
ibzrt-util/src/main/resources/application-sys.yml
浏览文件 @ 86d70e41
......@@ -85,3 +85,16 @@ ibiz:
enablePermissionValid: true
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或