提交 6ac82791 编写于 作者: ibizdev's avatar ibizdev

laizhilong 部署微服务应用

上级 524cd943
......@@ -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>
</div>
......
......@@ -496,25 +496,25 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -578,6 +578,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -604,6 +607,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -630,6 +636,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -656,6 +665,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -682,6 +694,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -708,6 +723,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -734,6 +752,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......
......@@ -504,25 +504,25 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -610,6 +610,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -636,6 +639,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -662,6 +668,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -688,6 +697,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -714,6 +726,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -740,6 +755,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -766,6 +784,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......
......@@ -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">
......@@ -555,34 +555,34 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -706,6 +706,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -732,6 +735,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -758,6 +764,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -784,6 +793,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -810,6 +822,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -836,6 +851,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -862,6 +880,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -888,6 +909,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -914,6 +938,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......@@ -940,6 +967,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"SYS_PERMISSION");
}
......
......@@ -496,25 +496,25 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -578,6 +578,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -604,6 +607,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -630,6 +636,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -656,6 +665,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -682,6 +694,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -708,6 +723,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -734,6 +752,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......
......@@ -504,25 +504,25 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -610,6 +610,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -636,6 +639,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -662,6 +668,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -688,6 +697,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -714,6 +726,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -740,6 +755,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -766,6 +784,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......
......@@ -6,7 +6,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">
......@@ -552,34 +552,34 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -703,6 +703,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -729,6 +732,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -755,6 +761,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -781,6 +790,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -807,6 +819,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -833,6 +848,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -859,6 +877,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -885,6 +906,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -911,6 +935,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......@@ -937,6 +964,9 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE_PERMISSION");
}
......
......@@ -496,25 +496,25 @@ export default class SYS_ROLEEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -578,6 +578,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -604,6 +607,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -630,6 +636,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -656,6 +665,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -682,6 +694,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -708,6 +723,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -734,6 +752,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......
......@@ -504,25 +504,25 @@ export default class SYS_ROLEEditView2Base extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -610,6 +610,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -636,6 +639,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -662,6 +668,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -688,6 +697,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -714,6 +726,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -740,6 +755,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -766,6 +784,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......
......@@ -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">
......@@ -555,34 +555,34 @@ export default class SYS_ROLEGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -706,6 +706,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -732,6 +735,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -758,6 +764,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -784,6 +793,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -810,6 +822,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -836,6 +851,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -862,6 +880,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -888,6 +909,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -914,6 +938,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......@@ -940,6 +967,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"SYS_ROLE");
}
......
......@@ -496,25 +496,25 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -578,6 +578,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -604,6 +607,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -630,6 +636,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -656,6 +665,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -682,6 +694,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -708,6 +723,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -734,6 +752,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......
......@@ -504,25 +504,25 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -610,6 +610,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -636,6 +639,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -662,6 +668,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -688,6 +697,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -714,6 +726,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -740,6 +755,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -766,6 +784,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......
......@@ -6,7 +6,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">
......@@ -552,34 +552,34 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -703,6 +703,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -729,6 +732,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -755,6 +761,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -781,6 +790,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -807,6 +819,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -833,6 +848,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -859,6 +877,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -885,6 +906,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -911,6 +935,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......@@ -937,6 +964,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"SYS_USER_ROLE");
}
......
......@@ -496,25 +496,25 @@ export default class SYS_USEREditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -578,6 +578,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -604,6 +607,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -630,6 +636,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -656,6 +665,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -682,6 +694,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -708,6 +723,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -734,6 +752,9 @@ export default class SYS_USEREditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......
......@@ -504,25 +504,25 @@ export default class SYS_USEREditView2Base extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem12')) {
this.toolbar_tbitem12_click($event, '', $event2);
this.toolbar_tbitem12_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem15')) {
this.toolbar_tbitem15_click($event, '', $event2);
this.toolbar_tbitem15_click(null, '', $event2);
}
}
......@@ -610,6 +610,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -636,6 +639,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndExit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -662,6 +668,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -688,6 +697,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -714,6 +726,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -740,6 +755,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -766,6 +784,9 @@ export default class SYS_USEREditView2Base extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......
......@@ -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">
......@@ -555,34 +555,34 @@ export default class SYS_USERGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -706,6 +706,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.New(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -732,6 +735,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -758,6 +764,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -784,6 +793,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -810,6 +822,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -836,6 +851,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -862,6 +880,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -888,6 +909,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -914,6 +938,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......@@ -940,6 +967,9 @@ export default class SYS_USERGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"SYS_USER");
}
......
......@@ -1279,7 +1279,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -1209,7 +1209,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -1199,7 +1199,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -1213,7 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -1213,7 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -1199,7 +1199,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
// this.rowClick(row, true);
}
/**
......
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
mvn clean package -Pweb
cd ibzuaa-app/ibzuaa-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
EXPOSE 8080
EXPOSE 30002
ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
......@@ -3,9 +3,23 @@ services:
ibzuaa-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
ports:
- "8080:8080"
- "30002:30002"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30002
- 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
- ABC=1
- DEC=2
deploy:
mode: replicated
replicas: 1
......
......@@ -150,7 +150,7 @@
<verbose>true</verbose>
<logging>debug</logging>
<contexts>!test</contexts>
<diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit</diffExcludeObjects>
<diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit,IBZFILE,IBZUSER,IBZDATAAUDIT</diffExcludeObjects>
</configuration>
<phase>process-resources</phase>
<goals>
......
......@@ -87,22 +87,8 @@
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_USER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user-42-4">
<createTable tableName="IBZUSER">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_USERID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PASSWORD" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSUNIRES]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-91-5">
<changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-91-4">
<createTable tableName="IBZPSSYSUNIRES">
<column name="SYS_PSSYSUNIRESID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSUNIRES_SYS_PSSYSUN"/>
......@@ -118,7 +104,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-47-6">
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-47-5">
<createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
......@@ -140,7 +126,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-191-7">
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-191-6">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
......@@ -160,7 +146,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-81-8">
<changeSet author="a_A_5d9d78509" id="tab-sys_role-81-7">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
......@@ -176,7 +162,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-9-9">
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-9-8">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
......@@ -186,7 +172,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_PSAPPMENUITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-98-10">
<changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-98-9">
<createTable tableName="IBZPSAPPMENUITEM">
<column name="SYS_PSAPPMENUITEMID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSAPPMENUITEM_SYS_PSAPP"/>
......@@ -217,17 +203,13 @@
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_PSDEOPPRIV]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-68-11">
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-68-10">
<addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
</changeSet>
<!--输出实体[SYS_USER]外键关系 -->
<!--输出实体[SYS_PSSYSUNIRES]外键关系 -->
<!--输出实体[SYS_USER_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-13">
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-12">
<addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-47-14">
<addForeignKeyConstraint baseColumnNames="SYS_USERID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_USER_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
</changeSet>
<!--输出实体[SYS_PERMISSION]外键关系 -->
<!--输出实体[SYS_ROLE]外键关系 -->
......
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
EXPOSE 40002
EXPOSE 8081
ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
......@@ -3,21 +3,9 @@ services:
ibzuaa-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports:
- "40002:40002"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40002
- 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
......
......@@ -54,20 +54,14 @@ public class SYS_AUTHLOGResource {
public SYS_AUTHLOGDTO permissionDTO=new SYS_AUTHLOGDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_AUTHLOG" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_authlogs/getdraft")
public ResponseEntity<SYS_AUTHLOGDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_authlogMapping.toDto(sys_authlogService.getDraft(new SYS_AUTHLOG())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_AUTHLOG" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_authlogs/{sys_authlog_id}")
@Transactional
......@@ -79,6 +73,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_AUTHLOG" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_authlogs/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
......@@ -86,10 +81,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_AUTHLOG" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_authlogs/{sys_authlog_id}")
@Transactional
......@@ -97,6 +89,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.remove(sys_authlog_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_AUTHLOG" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_authlogs/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -104,10 +97,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_AUTHLOG" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs")
@Transactional
......@@ -118,6 +108,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_AUTHLOG" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
......@@ -125,20 +116,14 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_AUTHLOG" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_AUTHLOGDTO sys_authlogdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.checkKey(sys_authlogMapping.toDomain(sys_authlogdto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_AUTHLOG" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_authlogs/{sys_authlog_id}")
public ResponseEntity<SYS_AUTHLOGDTO> get(@PathVariable("sys_authlog_id") String sys_authlog_id) {
......@@ -147,16 +132,14 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_AUTHLOG" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_AUTHLOGDTO sys_authlogdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_authlogService.save(sys_authlogMapping.toDomain(sys_authlogdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_AUTHLOG" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_authlogs/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_AUTHLOGDTO> sys_authlogdtos) {
......@@ -164,7 +147,7 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_AUTHLOG" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_authlogs/fetchdefault")
public ResponseEntity<List<SYS_AUTHLOGDTO>> fetchDefault(SYS_AUTHLOGSearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_AUTHLOGResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_AUTHLOG-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_AUTHLOG" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_authlogs/searchdefault")
public ResponseEntity<Page<SYS_AUTHLOGDTO>> searchDefault(@RequestBody SYS_AUTHLOGSearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_AUTHLOGResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_authlogMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
......@@ -54,16 +54,14 @@ public class SYS_PERMISSIONResource {
public SYS_PERMISSIONDTO permissionDTO=new SYS_PERMISSIONDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_PERMISSION" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_PERMISSIONDTO sys_permissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.save(sys_permissionMapping.toDomain(sys_permissiondto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_PERMISSION" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
......@@ -71,20 +69,14 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_PERMISSION" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/getdraft")
public ResponseEntity<SYS_PERMISSIONDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_permissionMapping.toDto(sys_permissionService.getDraft(new SYS_PERMISSION())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_PERMISSION" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/{sys_permission_id}")
@Transactional
......@@ -92,6 +84,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.remove(sys_permission_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_PERMISSION" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_permissions/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -99,10 +92,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_PERMISSION" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/{sys_permission_id}")
@Transactional
......@@ -114,6 +104,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_PERMISSION" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_permissions/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
......@@ -121,10 +112,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_PERMISSION" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions")
@Transactional
......@@ -135,6 +123,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_PERMISSION" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PERMISSIONDTO> sys_permissiondtos) {
......@@ -142,20 +131,14 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_PERMISSION" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PERMISSIONDTO sys_permissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_permissionService.checkKey(sys_permissionMapping.toDomain(sys_permissiondto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_PERMISSION" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}")
public ResponseEntity<SYS_PERMISSIONDTO> get(@PathVariable("sys_permission_id") String sys_permission_id) {
......@@ -164,7 +147,7 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_permissions/fetchdefault")
public ResponseEntity<List<SYS_PERMISSIONDTO>> fetchDefault(SYS_PERMISSIONSearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_PERMISSIONResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PERMISSION-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PERMISSION" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_permissions/searchdefault")
public ResponseEntity<Page<SYS_PERMISSIONDTO>> searchDefault(@RequestBody SYS_PERMISSIONSearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
......@@ -54,16 +54,14 @@ public class SYS_PSAPPMENUITEMResource {
public SYS_PSAPPMENUITEMDTO permissionDTO=new SYS_PSAPPMENUITEMDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_PSAPPMENUITEM" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_PSAPPMENUITEMDTO sys_psappmenuitemdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.save(sys_psappmenuitemMapping.toDomain(sys_psappmenuitemdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_PSAPPMENUITEM" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
......@@ -71,10 +69,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_PSAPPMENUITEM" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems")
@Transactional
......@@ -85,6 +80,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_PSAPPMENUITEM" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
......@@ -92,10 +88,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_PSAPPMENUITEM" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
@Transactional
......@@ -107,6 +100,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_PSAPPMENUITEM" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_psappmenuitems/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSAPPMENUITEMDTO> sys_psappmenuitemdtos) {
......@@ -114,30 +108,21 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_PSAPPMENUITEM" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/getdraft")
public ResponseEntity<SYS_PSAPPMENUITEMDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemMapping.toDto(sys_psappmenuitemService.getDraft(new SYS_PSAPPMENUITEM())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_PSAPPMENUITEM" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psappmenuitems/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PSAPPMENUITEMDTO sys_psappmenuitemdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.checkKey(sys_psappmenuitemMapping.toDomain(sys_psappmenuitemdto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_PSAPPMENUITEM" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
@Transactional
......@@ -145,6 +130,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_psappmenuitemService.remove(sys_psappmenuitem_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_PSAPPMENUITEM" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psappmenuitems/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -152,10 +138,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_PSAPPMENUITEM" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_psappmenuitems/{sys_psappmenuitem_id}")
public ResponseEntity<SYS_PSAPPMENUITEMDTO> get(@PathVariable("sys_psappmenuitem_id") String sys_psappmenuitem_id) {
......@@ -164,7 +147,7 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_psappmenuitems/fetchdefault")
public ResponseEntity<List<SYS_PSAPPMENUITEMDTO>> fetchDefault(SYS_PSAPPMENUITEMSearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_PSAPPMENUITEMResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSAPPMENUITEM-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSAPPMENUITEM" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_psappmenuitems/searchdefault")
public ResponseEntity<Page<SYS_PSAPPMENUITEMDTO>> searchDefault(@RequestBody SYS_PSAPPMENUITEMSearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_PSAPPMENUITEMResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_psappmenuitemMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
......@@ -54,10 +54,7 @@ public class SYS_PSDEOPPRIVResource {
public SYS_PSDEOPPRIVDTO permissionDTO=new SYS_PSDEOPPRIVDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_PSDEOPPRIV" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
@Transactional
......@@ -65,6 +62,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.remove(sys_psdeoppriv_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_PSDEOPPRIV" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_psdeopprivs/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -72,30 +70,21 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_PSDEOPPRIV" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_PSDEOPPRIVDTO sys_psdeopprivdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.checkKey(sys_psdeopprivMapping.toDomain(sys_psdeopprivdto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_PSDEOPPRIV" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/getdraft")
public ResponseEntity<SYS_PSDEOPPRIVDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivMapping.toDto(sys_psdeopprivService.getDraft(new SYS_PSDEOPPRIV())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_PSDEOPPRIV" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs")
@Transactional
......@@ -106,6 +95,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_PSDEOPPRIV" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
......@@ -113,10 +103,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_PSDEOPPRIV" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
public ResponseEntity<SYS_PSDEOPPRIVDTO> get(@PathVariable("sys_psdeoppriv_id") String sys_psdeoppriv_id) {
......@@ -125,10 +112,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_PSDEOPPRIV" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/{sys_psdeoppriv_id}")
@Transactional
......@@ -140,6 +124,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_PSDEOPPRIV" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_psdeopprivs/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
......@@ -147,16 +132,14 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_PSDEOPPRIV" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_PSDEOPPRIVDTO sys_psdeopprivdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_psdeopprivService.save(sys_psdeopprivMapping.toDomain(sys_psdeopprivdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_PSDEOPPRIV" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_psdeopprivs/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_PSDEOPPRIVDTO> sys_psdeopprivdtos) {
......@@ -164,7 +147,7 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_psdeopprivs/fetchdefault")
public ResponseEntity<List<SYS_PSDEOPPRIVDTO>> fetchDefault(SYS_PSDEOPPRIVSearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_PSDEOPPRIVResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_PSDEOPPRIV-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_PSDEOPPRIV" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_psdeopprivs/searchdefault")
public ResponseEntity<Page<SYS_PSDEOPPRIVDTO>> searchDefault(@RequestBody SYS_PSDEOPPRIVSearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_PSDEOPPRIVResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_psdeopprivMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
......@@ -54,16 +54,14 @@ public class SYS_ROLEResource {
public SYS_ROLEDTO permissionDTO=new SYS_ROLEDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_ROLE" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_ROLEDTO sys_roledto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.save(sys_roleMapping.toDomain(sys_roledto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_ROLE" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
......@@ -71,10 +69,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_ROLE" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/{sys_role_id}")
@Transactional
......@@ -86,6 +81,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_ROLE" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_roles/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
......@@ -93,10 +89,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_ROLE" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles")
@Transactional
......@@ -107,6 +100,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_ROLE" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_ROLEDTO> sys_roledtos) {
......@@ -114,10 +108,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_ROLE" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}")
public ResponseEntity<SYS_ROLEDTO> get(@PathVariable("sys_role_id") String sys_role_id) {
......@@ -126,10 +117,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_ROLE" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/{sys_role_id}")
@Transactional
......@@ -137,6 +125,7 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.remove(sys_role_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_ROLE" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_roles/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -144,27 +133,21 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_ROLE" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/getdraft")
public ResponseEntity<SYS_ROLEDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_roleMapping.toDto(sys_roleService.getDraft(new SYS_ROLE())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_ROLE" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_ROLEDTO sys_roledto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_roleService.checkKey(sys_roleMapping.toDomain(sys_roledto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_roles/fetchdefault")
public ResponseEntity<List<SYS_ROLEDTO>> fetchDefault(SYS_ROLESearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_ROLEResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_roles/searchdefault")
public ResponseEntity<Page<SYS_ROLEDTO>> searchDefault(@RequestBody SYS_ROLESearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_ROLEResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_roleMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
......@@ -54,10 +54,7 @@ public class SYS_USERResource {
public SYS_USERDTO permissionDTO=new SYS_USERDTO();
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Remove-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_USER" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/{sys_user_id}")
@Transactional
......@@ -65,6 +62,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(sys_userService.remove(sys_user_id));
}
@PreAuthorize("hasPermission('Remove',{'Sql',this.humanMapping,this.permissionDTO,#ids})")
@ApiOperation(value = "RemoveBatch", tags = {"SYS_USER" }, notes = "RemoveBatch")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_users/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -72,10 +70,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Update-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_USER" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/{sys_user_id}")
@Transactional
......@@ -87,6 +82,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Update',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "UpdateBatch", tags = {"SYS_USER" }, notes = "UpdateBatch")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_users/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
......@@ -94,20 +90,14 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-CheckKey-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_USER" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_USERDTO sys_userdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_userService.checkKey(sys_userMapping.toDomain(sys_userdto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Get-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_USER" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}")
public ResponseEntity<SYS_USERDTO> get(@PathVariable("sys_user_id") String sys_user_id) {
......@@ -116,16 +106,14 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Save-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_USER" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_USERDTO sys_userdto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_userService.save(sys_userMapping.toDomain(sys_userdto)));
}
@PreAuthorize("hasPermission('Save',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "SaveBatch", tags = {"SYS_USER" }, notes = "SaveBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
......@@ -133,20 +121,14 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-GetDraft-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_USER" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_users/getdraft")
public ResponseEntity<SYS_USERDTO> getDraft() {
return ResponseEntity.status(HttpStatus.OK).body(sys_userMapping.toDto(sys_userService.getDraft(new SYS_USER())));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Create-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_USER" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users")
@Transactional
......@@ -157,6 +139,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasPermission('Create',{'Sql',this.humanMapping,#humandtos})")
@ApiOperation(value = "createBatch", tags = {"SYS_USER" }, notes = "createBatch")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<SYS_USERDTO> sys_userdtos) {
......@@ -164,7 +147,7 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_users/fetchdefault")
public ResponseEntity<List<SYS_USERDTO>> fetchDefault(SYS_USERSearchContext context) {
......@@ -177,7 +160,7 @@ public class SYS_USERResource {
.body(list);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_users/searchdefault")
public ResponseEntity<Page<SYS_USERDTO>> searchDefault(@RequestBody SYS_USERSearchContext context) {
......@@ -185,8 +168,4 @@ public class SYS_USERResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sys_userMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册