Skip to content

I
ibzuaa
提交 315af86f 编写于 作者: laizhilong's avatar laizhilong
浏览文件
操作

Merge branch 'master' of http://labcs.ibizee.cn/ibiz4jteam/ibzuaa

上级 381a3193 7bc5cc93
隐藏空白字符变更
内嵌 并排
正在显示 包含 286 行增加 和 123 行删除
app_web/src/components/app-form-group/app-form-group.less
浏览文件 @ 315af86f
......@@ -9,6 +9,7 @@
}
>.ivu-card-extra {
.item-extract-mode {
display: flex;
.item {
margin-left: 12px;
}
......
app_web/src/locale/lanres/sys-role/sys-role_en_US.ts
浏览文件 @ 315af86f
......@@ -40,12 +40,10 @@ export default {
main_form: {
details: {
group1: "角色表基本信息",
druipart1: "资源",
druipart1: "权限",
tabpage1: "权限",
druipart2: "用户",
tabpage2: "用户",
druipart3: "角色权限关系",
tabpage3: "角色权限关系",
tabpanel1: "",
formpage1: "基本信息",
srfupdatedate: "更新时间",
......
app_web/src/locale/lanres/sys-role/sys-role_zh_CN.ts
浏览文件 @ 315af86f
......@@ -39,12 +39,10 @@ export default {
main_form: {
details: {
group1: '角色表基本信息',
druipart1: '资源',
druipart1: '权限',
tabpage1: '权限',
druipart2: '用户',
tabpage2: '用户',
druipart3: '角色权限关系',
tabpage3: '角色权限关系',
tabpanel1: '',
formpage1: '基本信息',
srfupdatedate: '更新时间',
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ 315af86f
......@@ -103,7 +103,6 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'61a949e3c23ebdda724888662ded1478',
'e791be173ed0f4bbe9cce942b6edde63',
'fb89f9af95f2caf92ccc1249025c9a1b',
],
......@@ -156,7 +155,6 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'61a949e3c23ebdda724888662ded1478',
'e791be173ed0f4bbe9cce942b6edde63',
'fb89f9af95f2caf92ccc1249025c9a1b',
],
......
app_web/src/widgets/control-service.ts
浏览文件 @ 315af86f
import { Store } from 'vuex';
import { Util } from '@/utils/util/util';
import CodeListService from "@service/app/codelist-service";
/**
* 部件服务基类
......@@ -26,6 +27,14 @@ export default class ControlService {
*/
public model: any | null = null;
/**
* 代码表服务对象
*
* @type {any}
* @memberof ControlService
*/
public codeListService:any;
/**
* 是否为从数据模式
*
......@@ -43,6 +52,7 @@ export default class ControlService {
constructor(opts: any = {}) {
this.$store = opts.$store;
this.setTempMode();
this.codeListService = new CodeListService({ $store:opts.$store });
}
/**
......@@ -118,31 +128,41 @@ export default class ControlService {
* @param {*} response
* @memberof ControlService
*/
public handleResponse(action: string, response: any,isCreate:boolean = false){
public async handleResponse(action: string, response: any,isCreate:boolean = false){
let result = null;
if (!response.data) {
return
} else if (response.data instanceof Array) {
result = [];
response.data.forEach((item:any) =>{
result.push(this.handleResponseData(action, item, isCreate));
});
}else{
result = this.handleResponseData(action, response.data, isCreate);
}
// response状态，头文件
if(response.headers){
if(response.headers['x-page']){
Object.assign(response,{page:Number(response.headers['x-page'])});
}
if(response.headers['x-per-page']){
Object.assign(response,{size:Number(response.headers['x-per-page'])});
const handleResult:any = (action: string, response: any,isCreate:boolean,codelistArray?:any) =>{
if (response.data instanceof Array) {
result = [];
response.data.forEach((item:any) =>{
result.push(this.handleResponseData(action, item, isCreate,codelistArray));
});
}else{
result = this.handleResponseData(action, response.data, isCreate,codelistArray);
}
if(response.headers['x-total']){
Object.assign(response,{total:Number(response.headers['x-total'])});
// response状态，头文件
if(response.headers){
if(response.headers['x-page']){
Object.assign(response,{page:Number(response.headers['x-page'])});
}
if(response.headers['x-per-page']){
Object.assign(response,{size:Number(response.headers['x-per-page'])});
}
if(response.headers['x-total']){
Object.assign(response,{total:Number(response.headers['x-total'])});
}
}
response.data = result;
}
let codelistModel:Array<any> = this.handleCodelist();
if(codelistModel.length >0){
let res:any = await this.getAllCodeList(codelistModel);
handleResult(action, response,isCreate,res);
}else{
handleResult(action, response,isCreate);
}
response.data = result;
}
/**
......@@ -152,7 +172,7 @@ export default class ControlService {
* @param {*} response
* @memberof ControlService
*/
public handleResponseData(action: string, data: any = {},isCreate?:boolean){
public handleResponseData(action: string, data: any = {},isCreate?:boolean,codelistArray?:any){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
......@@ -167,10 +187,13 @@ export default class ControlService {
if((isCreate === undefined || isCreate === null ) && Object.is(dataitem.dataType, 'GUID') && Object.is(dataitem.name, 'srfkey') && (val && !Object.is(val, ''))){
isCreate = true;
}
// if((Object.is(dataitem.dataType,'DATE') || Object.is(dataitem.dataType,'DATETIME')) && !Object.is(Date.parse(val),NaN)){
// val = Util.dateFormat(new Date(val));
// }
item[dataitem.name] = val;
// 转化代码表
if(codelistArray && dataitem.codelist){
if(codelistArray.get(dataitem.codelist.tag) && codelistArray.get(dataitem.codelist.tag).get(val)){
item[dataitem.name] = codelistArray.get(dataitem.codelist.tag).get(val);
}
}
});
item.srfuf = data.srfuf ? data.srfuf : (isCreate ? "0" : "1");
return item;
......@@ -199,4 +222,88 @@ export default class ControlService {
return requestData;
}
/**
* 处理代码表
*
* @memberof ControlService
*/
public handleCodelist(){
let model: any = this.getMode();
if (!model) {
return [];
}
let dataItems: any[] = model.getDataItems();
let codelistMap:Map<string,any> = new Map();
if(dataItems && dataItems.length >0){
dataItems.forEach((item:any) =>{
if(item.codelist){
codelistMap.set(item.name,item.codelist);
}
})
}
if(codelistMap.size >0){
return Array.from(codelistMap).map(item => item[1]);
}else{
return [];
}
}
/**
* 获取所有代码表
*
* @param codelistArray 代码表模型数组
* @memberof ControlService
*/
public getAllCodeList(codelistArray:Array<any>):Promise<any>{
return new Promise((resolve:any,reject:any) =>{
let codeListMap:Map<string,any> = new Map();
let promiseArray:Array<any> = [];
codelistArray.forEach((item:any) =>{
if(!codeListMap.get(item.tag)){
promiseArray.push(this.getCodeList(item));
Promise.all(promiseArray).then((result:any) =>{
if(result && result.length >0){
result.forEach((codeList:any) =>{
let tempCodeListMap:Map<number,any> = new Map();
if(codeList.length >0){
codeList.forEach((codeListItem:any) =>{
tempCodeListMap.set(codeListItem.value,codeListItem.text);
})
}
codeListMap.set(item.tag,tempCodeListMap);
})
resolve(codeListMap);
}
})
}
})
})
}
/**
* 获取代码表
*
* @param codeListObject 传入代码表对象
* @memberof ControlService
*/
public getCodeList(codeListObject:any):Promise<any>{
return new Promise((resolve:any,reject:any) =>{
if(codeListObject.tag && Object.is(codeListObject.codelistType,"STATIC")){
const codelist = (this.getStore() as Store<any>).getters.getCodeList(codeListObject.tag);
if (codelist) {
resolve([...JSON.parse(JSON.stringify(codelist.items))]);
} else {
resolve([]);
console.log(`----${codeListObject.tag}----代码表不存在`);
}
}else if(codeListObject.tag && Object.is(codeListObject.codelistType,"DYNAMIC")){
this.codeListService.getItems(codeListObject.tag).then((res:any) => {
resolve(res);
}).catch((error:any) => {
resolve([]);
console.log(`----${codeListObject.tag}----代码表不存在`);
});
}
})
}
}
\ No newline at end of file
app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue
浏览文件 @ 315af86f
......@@ -4,7 +4,7 @@
<row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role_permission.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role_permission.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.sys_rolename.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_rolename' :itemRules="this.rules.sys_rolename" class='' :caption="$t('entities.sys_role_permission.main_form.details.sys_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
......
app_web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @ 315af86f
......@@ -4,7 +4,7 @@
<row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_role.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.sys_roleid.visible" :style="{}" :lg="{ span: 12, offset: 0 }">
<app-form-item name='sys_roleid' :itemRules="this.rules.sys_roleid" class='' :caption="$t('entities.sys_role.main_form.details.sys_roleid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_roleid.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -56,10 +56,10 @@
:viewparams="viewparams"
parameterName='sys_role'
parentName="SYS_ROLE"
refviewtype='DEGRIDVIEW'
refviewtype='DECUSTOMVIEW'
refreshitems=''
:ignorefieldvaluechange="ignorefieldvaluechange"
viewname='sys-role-permissiongrid-view'
viewname='sys-role-permissioncustom-view'
:data="JSON.stringify(this.data)"
@drdatasaved="drdatasaved($event)"
style=";overflow: auto;">
......@@ -101,42 +101,6 @@
style=";overflow: auto;">
</app-form-druipart>
</i-col>
</tab-pane>
<tab-pane v-show="detailsModel.tabpage3.visible" name='tabpage3' :index="2" tab='tabpanel1' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.sys_role.main_form.details.tabpage3')
])
}">
<i-col v-show="detailsModel.druipart3.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-druipart
:formState="formState"
:isForbidLoad="this.data.srfuf === '0'"
paramItem='sys_role'
:parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID"}'
:parameters="[
{ pathName: 'sys_permissions', parameterName: 'sys_permission' },
]"
:context="context"
:viewparams="viewparams"
parameterName='sys_role'
parentName="SYS_ROLE"
refviewtype='DECUSTOMVIEW'
refreshitems=''
:ignorefieldvaluechange="ignorefieldvaluechange"
viewname='sys-role-permissioncustom-view'
:data="JSON.stringify(this.data)"
@drdatasaved="drdatasaved($event)"
style=";overflow: auto;">
</app-form-druipart>
</i-col>
......@@ -565,7 +529,7 @@ export default class MainBase extends Vue implements ControlInterface {
public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '角色表基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.sys_role.main_form', extractMode: 'ITEM', details: [] } })
,
druipart1: new FormDRUIPartModel({ caption: '资源', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this })
druipart1: new FormDRUIPartModel({ caption: '权限', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this })
,
tabpage1: new FormTabPageModel({ caption: '权限', detailType: 'TABPAGE', name: 'tabpage1', visible: true, isShowCaption: true, form: this })
,
......@@ -573,11 +537,7 @@ export default class MainBase extends Vue implements ControlInterface {
,
tabpage2: new FormTabPageModel({ caption: '用户', detailType: 'TABPAGE', name: 'tabpage2', visible: true, isShowCaption: true, form: this })
,
druipart3: new FormDRUIPartModel({ caption: '角色权限关系', detailType: 'DRUIPART', name: 'druipart3', visible: true, isShowCaption: true, form: this })
,
tabpage3: new FormTabPageModel({ caption: '角色权限关系', detailType: 'TABPAGE', name: 'tabpage3', visible: true, isShowCaption: true, form: this })
,
tabpanel1: new FormTabPanelModel({ caption: '', detailType: 'TABPANEL', name: 'tabpanel1', visible: true, isShowCaption: false, form: this, tabPages: [{ name: 'tabpage1', index: 0, visible: true }, { name: 'tabpage2', index: 1, visible: true }, { name: 'tabpage3', index: 2, visible: true }] })
tabpanel1: new FormTabPanelModel({ caption: '', detailType: 'TABPANEL', name: 'tabpanel1', visible: true, isShowCaption: false, form: this, tabPages: [{ name: 'tabpage1', index: 0, visible: true }, { name: 'tabpage2', index: 1, visible: true }] })
,
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
......@@ -790,8 +750,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
......@@ -1316,7 +1274,7 @@ export default class MainBase extends Vue implements ControlInterface {
Object.assign(arg, data);
Object.assign(arg, this.context);
if (ifStateNext) {
this.drcounter = 3;
this.drcounter = 2;
if(this.drcounter !== 0){
this.drsaveopt = opt;
this.formState.next({ type: 'beforesave', data: arg });//先通知关系界面保存
......
app_web/src/widgets/sys-user-role/main-form/main-form-base.vue
浏览文件 @ 315af86f
......@@ -4,7 +4,7 @@
<row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_user_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_user_role.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.sys_user_rolename.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_user_rolename' :itemRules="this.rules.sys_user_rolename" class='' :caption="$t('entities.sys_user_role.main_form.details.sys_user_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_user_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
......
config.xml
浏览文件 @ 315af86f
......@@ -37,6 +37,11 @@
git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/
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>
......
ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
浏览文件 @ 315af86f
......@@ -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
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @ 315af86f
......@@ -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
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PERMISSIONMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_PERMISSIONMapper extends BaseMapper<SYS_PERMISSION>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_PERMISSION entity);
@Override
int update(@Param(Constants.ENTITY) SYS_PERMISSION entity, @Param("ew") Wrapper<SYS_PERMISSION> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PSAPPMENUITEMMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_PSAPPMENUITEMMapper extends BaseMapper<SYS_PSAPPMENUITEM>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_PSAPPMENUITEM entity);
@Override
int update(@Param(Constants.ENTITY) SYS_PSAPPMENUITEM entity, @Param("ew") Wrapper<SYS_PSAPPMENUITEM> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PSDEOPPRIVMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_PSDEOPPRIVMapper extends BaseMapper<SYS_PSDEOPPRIV>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_PSDEOPPRIV entity);
@Override
int update(@Param(Constants.ENTITY) SYS_PSDEOPPRIV entity, @Param("ew") Wrapper<SYS_PSDEOPPRIV> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PSSYSTEMMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_PSSYSTEMMapper extends BaseMapper<SYS_PSSYSTEM>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_PSSYSTEM entity);
@Override
int update(@Param(Constants.ENTITY) SYS_PSSYSTEM entity, @Param("ew") Wrapper<SYS_PSSYSTEM> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PSSYSUNIRESMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_PSSYSUNIRESMapper extends BaseMapper<SYS_PSSYSUNIRES>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_PSSYSUNIRES entity);
@Override
int update(@Param(Constants.ENTITY) SYS_PSSYSUNIRES entity, @Param("ew") Wrapper<SYS_PSSYSUNIRES> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_ROLEMapper.java
浏览文件 @ 315af86f
......@@ -30,6 +30,9 @@ public interface SYS_ROLEMapper extends BaseMapper<SYS_ROLE>{
@CacheEvict( value="sys_role",key = "'row:'+#p0.roleid")
int updateById(@Param(Constants.ENTITY) SYS_ROLE entity);
@Override
@CacheEvict(value="sys_role",key = "'row:'+#p0.roleid")
int update(@Param(Constants.ENTITY) SYS_ROLE entity, @Param("ew") Wrapper<SYS_ROLE> updateWrapper);
@Override
@CacheEvict( value="sys_role",key = "'row:'+#p0")
int deleteById(Serializable id);
/**
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_ROLE_PERMISSIONMapper.java
浏览文件 @ 315af86f
......@@ -28,6 +28,8 @@ public interface SYS_ROLE_PERMISSIONMapper extends BaseMapper<SYS_ROLE_PERMISSIO
@Override
int updateById(@Param(Constants.ENTITY) SYS_ROLE_PERMISSION entity);
@Override
int update(@Param(Constants.ENTITY) SYS_ROLE_PERMISSION entity, @Param("ew") Wrapper<SYS_ROLE_PERMISSION> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_USERMapper.java
浏览文件 @ 315af86f
......@@ -30,6 +30,9 @@ public interface SYS_USERMapper extends BaseMapper<SYS_USER>{
@CacheEvict( value="sys_user",key = "'row:'+#p0.userid")
int updateById(@Param(Constants.ENTITY) SYS_USER entity);
@Override
@CacheEvict(value="sys_user",key = "'row:'+#p0.userid")
int update(@Param(Constants.ENTITY) SYS_USER entity, @Param("ew") Wrapper<SYS_USER> updateWrapper);
@Override
@CacheEvict( value="sys_user",key = "'row:'+#p0")
int deleteById(Serializable id);
/**
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_USER_ROLEMapper.java
浏览文件 @ 315af86f
......@@ -27,6 +27,8 @@ public interface SYS_USER_ROLEMapper extends BaseMapper<SYS_USER_ROLE>{
@Override
int updateById(@Param(Constants.ENTITY) SYS_USER_ROLE entity);
@Override
int update(@Param(Constants.ENTITY) SYS_USER_ROLE entity, @Param("ew") Wrapper<SYS_USER_ROLE> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PERMISSIONService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_PERMISSION;
import cn.ibizlab.core.uaa.filter.SYS_PERMISSIONSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PSAPPMENUITEMService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_PSAPPMENUITEM;
import cn.ibizlab.core.uaa.filter.SYS_PSAPPMENUITEMSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PSDEOPPRIVService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_PSDEOPPRIV;
import cn.ibizlab.core.uaa.filter.SYS_PSDEOPPRIVSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PSSYSTEMService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_PSSYSTEM;
import cn.ibizlab.core.uaa.filter.SYS_PSSYSTEMSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PSSYSUNIRESService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_PSSYSUNIRES;
import cn.ibizlab.core.uaa.filter.SYS_PSSYSUNIRESSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_ROLEService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_ROLE;
import cn.ibizlab.core.uaa.filter.SYS_ROLESearchContext;
......@@ -25,13 +26,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface ISYS_ROLEService extends IService<SYS_ROLE>{
boolean save(SYS_ROLE et) ;
@CacheEvict(value="sys_role",allEntries=true)
void saveBatch(List<SYS_ROLE> list) ;
boolean update(SYS_ROLE et) ;
@CacheEvict(value="sys_role",allEntries=true)
void updateBatch(List<SYS_ROLE> list) ;
boolean create(SYS_ROLE et) ;
@CacheEvict(value="sys_role",allEntries=true)
void createBatch(List<SYS_ROLE> list) ;
SYS_ROLE get(String key) ;
boolean remove(String key) ;
@CacheEvict(value="sys_role",allEntries=true)
void removeBatch(Collection<String> idList) ;
SYS_ROLE getDraft(SYS_ROLE et) ;
boolean checkKey(SYS_ROLE et) ;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_ROLE_PERMISSIONService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_ROLE_PERMISSION;
import cn.ibizlab.core.uaa.filter.SYS_ROLE_PERMISSIONSearchContext;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_USERService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_USER;
import cn.ibizlab.core.uaa.filter.SYS_USERSearchContext;
......@@ -25,15 +26,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface ISYS_USERService extends IService<SYS_USER>{
boolean remove(String key) ;
@CacheEvict(value="sys_user",allEntries=true)
void removeBatch(Collection<String> idList) ;
boolean update(SYS_USER et) ;
@CacheEvict(value="sys_user",allEntries=true)
void updateBatch(List<SYS_USER> list) ;
boolean checkKey(SYS_USER et) ;
SYS_USER get(String key) ;
boolean save(SYS_USER et) ;
@CacheEvict(value="sys_user",allEntries=true)
void saveBatch(List<SYS_USER> list) ;
SYS_USER getDraft(SYS_USER et) ;
boolean create(SYS_USER et) ;
@CacheEvict(value="sys_user",allEntries=true)
void createBatch(List<SYS_USER> list) ;
Page<SYS_USER> searchDefault(SYS_USERSearchContext context) ;
/**
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_USER_ROLEService.java
浏览文件 @ 315af86f
......@@ -12,6 +12,7 @@ import java.math.BigInteger;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.uaa.domain.SYS_USER_ROLE;
import cn.ibizlab.core.uaa.filter.SYS_USER_ROLESearchContext;
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 315af86f
......@@ -136,7 +136,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-77-7">
<changeSet author="a_A_5d9d78509" id="tab-sys_role-79-7">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PERMISSIONResource.java
浏览文件 @ 315af86f
......@@ -57,6 +57,7 @@ public class SYS_PERMISSIONResource {
//@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) {
......@@ -73,6 +74,7 @@ public class SYS_PERMISSIONResource {
//@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() {
......@@ -82,7 +84,7 @@ public class SYS_PERMISSIONResource {
@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
......@@ -100,7 +102,7 @@ public class SYS_PERMISSIONResource {
@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
......@@ -122,7 +124,7 @@ public class SYS_PERMISSIONResource {
@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
......@@ -143,6 +145,7 @@ public class SYS_PERMISSIONResource {
//@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) {
......@@ -152,7 +155,7 @@ public class SYS_PERMISSIONResource {
@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) {
......@@ -161,7 +164,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) {
......@@ -174,7 +177,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,3 +188,5 @@ public class SYS_PERMISSIONResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSAPPMENUITEMResource.java
浏览文件 @ 315af86f
......@@ -57,6 +57,7 @@ public class SYS_PSAPPMENUITEMResource {
//@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) {
......@@ -73,7 +74,7 @@ public class SYS_PSAPPMENUITEMResource {
@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
......@@ -94,7 +95,7 @@ public class SYS_PSAPPMENUITEMResource {
@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
......@@ -116,6 +117,7 @@ public class SYS_PSAPPMENUITEMResource {
//@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() {
......@@ -125,6 +127,7 @@ public class SYS_PSAPPMENUITEMResource {
//@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) {
......@@ -134,7 +137,7 @@ public class SYS_PSAPPMENUITEMResource {
@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
......@@ -152,7 +155,7 @@ public class SYS_PSAPPMENUITEMResource {
@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) {
......@@ -161,7 +164,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) {
......@@ -174,7 +177,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,3 +188,5 @@ public class SYS_PSAPPMENUITEMResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_PSDEOPPRIVResource.java
浏览文件 @ 315af86f
......@@ -57,7 +57,7 @@ public class SYS_PSDEOPPRIVResource {
@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
......@@ -75,6 +75,7 @@ public class SYS_PSDEOPPRIVResource {
//@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) {
......@@ -84,6 +85,7 @@ public class SYS_PSDEOPPRIVResource {
//@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() {
......@@ -93,7 +95,7 @@ public class SYS_PSDEOPPRIVResource {
@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
......@@ -114,7 +116,7 @@ public class SYS_PSDEOPPRIVResource {
@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) {
......@@ -126,7 +128,7 @@ public class SYS_PSDEOPPRIVResource {
@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
......@@ -148,6 +150,7 @@ public class SYS_PSDEOPPRIVResource {
//@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) {
......@@ -161,7 +164,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) {
......@@ -174,7 +177,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,3 +188,5 @@ public class SYS_PSDEOPPRIVResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLEResource.java
浏览文件 @ 315af86f
......@@ -57,6 +57,7 @@ public class SYS_ROLEResource {
//@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) {
......@@ -73,7 +74,7 @@ public class SYS_ROLEResource {
@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
......@@ -95,7 +96,7 @@ public class SYS_ROLEResource {
@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
......@@ -116,7 +117,7 @@ public class SYS_ROLEResource {
@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) {
......@@ -128,7 +129,7 @@ public class SYS_ROLEResource {
@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
......@@ -146,6 +147,7 @@ public class SYS_ROLEResource {
//@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() {
......@@ -155,13 +157,14 @@ public class SYS_ROLEResource {
//@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) {
......@@ -174,7 +177,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,3 +188,5 @@ public class SYS_ROLEResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java
浏览文件 @ 315af86f
......@@ -87,6 +87,7 @@ public class SYS_ROLE_PERMISSIONResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_ROLE_PERMISSION" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_role_permissions/getdraft")
public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraft() {
......@@ -117,6 +118,7 @@ public class SYS_ROLE_PERMISSIONResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_ROLE_PERMISSION" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
......@@ -126,6 +128,7 @@ public class SYS_ROLE_PERMISSIONResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_ROLE_PERMISSION" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_role_permissions/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
......@@ -161,7 +164,7 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchdefault")
public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchDefault(SYS_ROLE_PERMISSIONSearchContext context) {
......@@ -174,7 +177,7 @@ public class SYS_ROLE_PERMISSIONResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_role_permissions/searchdefault")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchDefault(@RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
......@@ -183,7 +186,7 @@ public class SYS_ROLE_PERMISSIONResource {
.body(new PageImpl(sys_role_permissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
@ApiOperation(value = "fetchpermissionenable1", tags = {"SYS_ROLE_PERMISSION" } ,notes = "fetchpermissionenable1")
@RequestMapping(method= RequestMethod.GET , value="/sys_role_permissions/fetchpermissionenable1")
public ResponseEntity<List<SYS_ROLE_PERMISSIONDTO>> fetchPermissionenable1(SYS_ROLE_PERMISSIONSearchContext context) {
......@@ -196,7 +199,7 @@ public class SYS_ROLE_PERMISSIONResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Permissionenable1-all')")
@ApiOperation(value = "searchpermissionenable1", tags = {"SYS_ROLE_PERMISSION" } ,notes = "searchpermissionenable1")
@RequestMapping(method= RequestMethod.POST , value="/sys_role_permissions/searchpermissionenable1")
public ResponseEntity<Page<SYS_ROLE_PERMISSIONDTO>> searchPermissionenable1(@RequestBody SYS_ROLE_PERMISSIONSearchContext context) {
......@@ -231,6 +234,7 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
@ApiOperation(value = "GetDraftBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" }, notes = "GetDraftBySYS_PERMISSION")
@RequestMapping(method = RequestMethod.GET, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/getdraft")
public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraftBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id) {
......@@ -262,12 +266,14 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
@ApiOperation(value = "CheckKeyBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" }, notes = "CheckKeyBySYS_PERMISSION")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/checkkey")
public ResponseEntity<Boolean> checkKeyBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.checkKey(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
@ApiOperation(value = "SaveBySYS_PERMISSION", tags = {"SYS_ROLE_PERMISSION" }, notes = "SaveBySYS_PERMISSION")
@RequestMapping(method = RequestMethod.POST, value = "/sys_permissions/{sys_permission_id}/sys_role_permissions/save")
public ResponseEntity<Boolean> saveBySYS_PERMISSION(@PathVariable("sys_permission_id") String sys_permission_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
......@@ -385,6 +391,7 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-GetDraft-all')")
@ApiOperation(value = "GetDraftBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" }, notes = "GetDraftBySYS_ROLE")
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_role_permissions/getdraft")
public ResponseEntity<SYS_ROLE_PERMISSIONDTO> getDraftBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id) {
......@@ -416,12 +423,14 @@ public class SYS_ROLE_PERMISSIONResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-CheckKey-all')")
@ApiOperation(value = "CheckKeyBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" }, notes = "CheckKeyBySYS_ROLE")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/checkkey")
public ResponseEntity<Boolean> checkKeyBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_role_permissionService.checkKey(sys_role_permissionMapping.toDomain(sys_role_permissiondto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_ROLE_PERMISSION-Save-all')")
@ApiOperation(value = "SaveBySYS_ROLE", tags = {"SYS_ROLE_PERMISSION" }, notes = "SaveBySYS_ROLE")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_role_permissions/save")
public ResponseEntity<Boolean> saveBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_ROLE_PERMISSIONDTO sys_role_permissiondto) {
......@@ -515,3 +524,5 @@ public class SYS_ROLE_PERMISSIONResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USERResource.java
浏览文件 @ 315af86f
......@@ -57,7 +57,7 @@ public class SYS_USERResource {
@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
......@@ -75,7 +75,7 @@ public class SYS_USERResource {
@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
......@@ -97,6 +97,7 @@ public class SYS_USERResource {
//@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) {
......@@ -106,7 +107,7 @@ public class SYS_USERResource {
@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) {
......@@ -118,6 +119,7 @@ public class SYS_USERResource {
//@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) {
......@@ -134,6 +136,7 @@ public class SYS_USERResource {
//@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() {
......@@ -143,7 +146,7 @@ public class SYS_USERResource {
@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
......@@ -161,7 +164,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) {
......@@ -174,7 +177,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,3 +188,5 @@ public class SYS_USERResource {
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_USER_ROLEResource.java
浏览文件 @ 315af86f
......@@ -57,6 +57,7 @@ public class SYS_USER_ROLEResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
@ApiOperation(value = "CheckKey", tags = {"SYS_USER_ROLE" }, notes = "CheckKey")
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/checkkey")
public ResponseEntity<Boolean> checkKey(@RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
......@@ -66,6 +67,7 @@ public class SYS_USER_ROLEResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
@ApiOperation(value = "GetDraft", tags = {"SYS_USER_ROLE" }, notes = "GetDraft")
@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/getdraft")
public ResponseEntity<SYS_USER_ROLEDTO> getDraft() {
......@@ -75,7 +77,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Update-all')")
@ApiOperation(value = "Update", tags = {"SYS_USER_ROLE" }, notes = "Update")
@RequestMapping(method = RequestMethod.PUT, value = "/sys_user_roles/{sys_user_role_id}")
@Transactional
......@@ -97,7 +99,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Remove-all')")
@ApiOperation(value = "Remove", tags = {"SYS_USER_ROLE" }, notes = "Remove")
@RequestMapping(method = RequestMethod.DELETE, value = "/sys_user_roles/{sys_user_role_id}")
@Transactional
......@@ -115,7 +117,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Create-all')")
@ApiOperation(value = "Create", tags = {"SYS_USER_ROLE" }, notes = "Create")
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles")
@Transactional
......@@ -136,7 +138,7 @@ public class SYS_USER_ROLEResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Get-all')")
@ApiOperation(value = "Get", tags = {"SYS_USER_ROLE" }, notes = "Get")
@RequestMapping(method = RequestMethod.GET, value = "/sys_user_roles/{sys_user_role_id}")
public ResponseEntity<SYS_USER_ROLEDTO> get(@PathVariable("sys_user_role_id") String sys_user_role_id) {
......@@ -148,6 +150,7 @@ public class SYS_USER_ROLEResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
@ApiOperation(value = "Save", tags = {"SYS_USER_ROLE" }, notes = "Save")
@RequestMapping(method = RequestMethod.POST, value = "/sys_user_roles/save")
public ResponseEntity<Boolean> save(@RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
......@@ -161,7 +164,7 @@ public class SYS_USER_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
@ApiOperation(value = "fetchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "fetchDEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sys_user_roles/fetchdefault")
public ResponseEntity<List<SYS_USER_ROLEDTO>> fetchDefault(SYS_USER_ROLESearchContext context) {
......@@ -174,7 +177,7 @@ public class SYS_USER_ROLEResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Default-all')")
@ApiOperation(value = "searchDEFAULT", tags = {"SYS_USER_ROLE" } ,notes = "searchDEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sys_user_roles/searchdefault")
public ResponseEntity<Page<SYS_USER_ROLEDTO>> searchDefault(@RequestBody SYS_USER_ROLESearchContext context) {
......@@ -185,12 +188,14 @@ public class SYS_USER_ROLEResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
@ApiOperation(value = "CheckKeyBySYS_ROLE", tags = {"SYS_USER_ROLE" }, notes = "CheckKeyBySYS_ROLE")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/checkkey")
public ResponseEntity<Boolean> checkKeyBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.checkKey(sys_user_roleMapping.toDomain(sys_user_roledto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
@ApiOperation(value = "GetDraftBySYS_ROLE", tags = {"SYS_USER_ROLE" }, notes = "GetDraftBySYS_ROLE")
@RequestMapping(method = RequestMethod.GET, value = "/sys_roles/{sys_role_id}/sys_user_roles/getdraft")
public ResponseEntity<SYS_USER_ROLEDTO> getDraftBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id) {
......@@ -270,6 +275,7 @@ public class SYS_USER_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
@ApiOperation(value = "SaveBySYS_ROLE", tags = {"SYS_USER_ROLE" }, notes = "SaveBySYS_ROLE")
@RequestMapping(method = RequestMethod.POST, value = "/sys_roles/{sys_role_id}/sys_user_roles/save")
public ResponseEntity<Boolean> saveBySYS_ROLE(@PathVariable("sys_role_id") String sys_role_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
......@@ -315,12 +321,14 @@ public class SYS_USER_ROLEResource {
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-CheckKey-all')")
@ApiOperation(value = "CheckKeyBySYS_USER", tags = {"SYS_USER_ROLE" }, notes = "CheckKeyBySYS_USER")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/checkkey")
public ResponseEntity<Boolean> checkKeyBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
return ResponseEntity.status(HttpStatus.OK).body(sys_user_roleService.checkKey(sys_user_roleMapping.toDomain(sys_user_roledto)));
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-GetDraft-all')")
@ApiOperation(value = "GetDraftBySYS_USER", tags = {"SYS_USER_ROLE" }, notes = "GetDraftBySYS_USER")
@RequestMapping(method = RequestMethod.GET, value = "/sys_users/{sys_user_id}/sys_user_roles/getdraft")
public ResponseEntity<SYS_USER_ROLEDTO> getDraftBySYS_USER(@PathVariable("sys_user_id") String sys_user_id) {
......@@ -400,6 +408,7 @@ public class SYS_USER_ROLEResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
//@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SYS_USER_ROLE-Save-all')")
@ApiOperation(value = "SaveBySYS_USER", tags = {"SYS_USER_ROLE" }, notes = "SaveBySYS_USER")
@RequestMapping(method = RequestMethod.POST, value = "/sys_users/{sys_user_id}/sys_user_roles/save")
public ResponseEntity<Boolean> saveBySYS_USER(@PathVariable("sys_user_id") String sys_user_id, @RequestBody SYS_USER_ROLEDTO sys_user_roledto) {
......@@ -445,3 +454,5 @@ public class SYS_USER_ROLEResource {
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或