Skip to content

I
ibzuaa
提交 b2cf0255 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 3a68ad3f
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1546 行增加 和 279 行删除
app_web/public/assets/json/view-config.json
浏览文件 @ b2cf0255
......@@ -95,12 +95,12 @@
"viewname": "SYS_ROLE_PERMISSIONRedirectView",
"viewtag": "47fb02384b5797f4b095e247619515f4"
},
"sys_role_permissiongridview": {
"sysrolepermissiongridview": {
"title": "角色权限关系表表格视图",
"caption": "角色权限关系",
"viewtype": "DEGRIDVIEW",
"viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONGridView",
"viewname": "SysRolePermissionGridView",
"viewtag": "61a949e3c23ebdda724888662ded1478"
},
"sys_role_permissionpickupgridview": {
......
app_web/src/components/app-department-select/app-department-select.vue
浏览文件 @ b2cf0255
......@@ -120,7 +120,6 @@ export default class AppDepartmentSelect extends Vue {
return;
}
this.$http.get(_url).then((response: any) => {
console.log(response)
this.Nodesdata = response.data;
this.$store.commit('addDepData', { srfkey: this.filter, orgData: response.data });
}).catch((response: any) => {
......
app_web/src/components/app-org-select/app-org-select.vue
浏览文件 @ b2cf0255
......@@ -236,7 +236,7 @@ export default class AppOrgSelect extends Vue {
* @memberof AppOrgSelect
*/
public emitValue(name:string,value:any){
this.$emit('formitemvaluechange',{name:name,value:value});
this.$emit('select-change',{name:name,value:value});
}
}
......
app_web/src/locale/lanres/sys-role-permission/sys-role-permission_en_US.ts
浏览文件 @ b2cf0255
......@@ -6,6 +6,8 @@ export default {
rolename: '角色名称',
permissionid: '权限表标识',
permissionname: '权限名称',
permissiontype: '权限类型',
permissionenable: '权限类型',
createdate: '建立时间',
updatedate: '更新时间',
},
......
app_web/src/locale/lanres/sys-role-permission/sys-role-permission_zh_CN.ts
浏览文件 @ b2cf0255
......@@ -5,6 +5,8 @@ export default {
rolename: '角色名称',
permissionid: '权限表标识',
permissionname: '权限名称',
permissiontype: '权限类型',
permissionenable: '权限类型',
createdate: '建立时间',
updatedate: '更新时间',
},
......
app_web/src/mock/entity/sys-role-permissions/sys-role-permissions.ts
浏览文件 @ b2cf0255
......@@ -717,140 +717,6 @@ mock.onGet(new RegExp(/^\/sysrolepermissions\/fetchdefault(\?[\w-./?%&=,]*)*$/))
return [status, records ? records : []];
});
// FetchPermissionenable1
mock.onGet(new RegExp(/^\/sysroles\/([a-zA-Z0-9\-\;]{1,35})\/sysrolepermissions\/fetchpermissionenable1$/)).reply((config: any) => {
console.groupCollapsed("实体:sysrolepermission 方法: FetchPermissionenable1");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['roleid'];
let tempValue: any = {};
const matchArray:any = new RegExp(/^\/sysroles\/([a-zA-Z0-9\-\;]{1,35})\/sysrolepermissions\/fetchpermissionenable1$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
if (items.length > 0 && paramArray.length > 0) {
paramArray.forEach((paramkey: any) => {
if (tempValue[paramkey] && tempValue[paramkey].indexOf(";") > 0) {
let keysGrounp: Array<any> = tempValue[paramkey].split(new RegExp(/[\;]/));
let tempArray: Array<any> = [];
keysGrounp.forEach((singlekey: any) => {
let _items = items.filter((item: any) => { return item[paramkey] == singlekey });
if(_items.length >0){
tempArray.push(..._items);
}
})
items = tempArray;
} else {
items = items.filter((item: any) => { return item[paramkey] == tempValue[paramkey] });
}
})
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(items);
console.groupEnd();
console.groupEnd();
return [status, items];
});
// FetchPermissionenable1
mock.onGet(new RegExp(/^\/syspermissions\/([a-zA-Z0-9\-\;]{1,35})\/sysrolepermissions\/fetchpermissionenable1$/)).reply((config: any) => {
console.groupCollapsed("实体:sysrolepermission 方法: FetchPermissionenable1");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
const paramArray:Array<any> = ['permissionid'];
let tempValue: any = {};
const matchArray:any = new RegExp(/^\/syspermissions\/([a-zA-Z0-9\-\;]{1,35})\/sysrolepermissions\/fetchpermissionenable1$/).exec(config.url);
if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
paramArray.forEach((item: any, index: number) => {
Object.defineProperty(tempValue, item, {
enumerable: true,
value: matchArray[index + 1]
});
});
}
let items = mockDatas ? mockDatas : [];
if (items.length > 0 && paramArray.length > 0) {
paramArray.forEach((paramkey: any) => {
if (tempValue[paramkey] && tempValue[paramkey].indexOf(";") > 0) {
let keysGrounp: Array<any> = tempValue[paramkey].split(new RegExp(/[\;]/));
let tempArray: Array<any> = [];
keysGrounp.forEach((singlekey: any) => {
let _items = items.filter((item: any) => { return item[paramkey] == singlekey });
if(_items.length >0){
tempArray.push(..._items);
}
})
items = tempArray;
} else {
items = items.filter((item: any) => { return item[paramkey] == tempValue[paramkey] });
}
})
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(items);
console.groupEnd();
console.groupEnd();
return [status, items];
});
// FetchPermissionenable1
mock.onGet(new RegExp(/^\/sysrolepermissions\/fetchpermissionenable1$/)).reply((config: any) => {
console.groupCollapsed("实体:sysrolepermission 方法: FetchPermissionenable1");
console.table({url:config.url, method: config.method, data:config.data});
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(mockDatas);
console.groupEnd();
console.groupEnd();
return [status, mockDatas ? mockDatas : []];
});
// FetchPermissionenable1
mock.onGet(new RegExp(/^\/sysrolepermissions\/fetchpermissionenable1(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
console.groupCollapsed("实体:sysrolepermission 方法: FetchPermissionenable1");
console.table({url:config.url, method: config.method, data:config.data});
if(config.url.includes('page')){
let url = config.url.split('?')[1];
let params = qs.parse(url);
Object.assign(config, params);
}
let status = MockAdapter.mockStatus(config);
if (status !== 200) {
return [status, null];
}
let total = mockDatas.length;
let records: Array<any> = [];
if(!config.page || !config.size){
records = mockDatas;
}else{
if((config.page-1)*config.size < total){
records = mockDatas.slice(config.page,config.size);
}
}
console.groupCollapsed("response数据 status: "+status+" data: ");
console.table(records ? records : []);
console.groupEnd();
console.groupEnd();
return [status, records ? records : []];
});
// URI参数传递情况未实现
// URI参数传递情况未实现
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ b2cf0255
......@@ -103,12 +103,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "SYS_ROLE_PERMISSIONRedirectView",
"viewtag": "47fb02384b5797f4b095e247619515f4"
},
"sys_role_permissiongridview": {
"sysrolepermissiongridview": {
"title": "角色权限关系表表格视图",
"caption": "角色权限关系",
"viewtype": "DEGRIDVIEW",
"viewmodule": "uaa",
"viewname": "SYS_ROLE_PERMISSIONGridView",
"viewname": "SysRolePermissionGridView",
"viewtag": "61a949e3c23ebdda724888662ded1478"
},
"sys_role_permissionpickupgridview": {
......
app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view.less 0 → 100644
浏览文件 @ b2cf0255
.sys-role-permission-grid-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view.vue 0 → 100644
浏览文件 @ b2cf0255
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import SysRolePermissionGridViewBase from './sys-role-permission-grid-view-base.vue';
import view_grid from '@widgets/sys-role-permission/main-grid/main-grid.vue';
import view_searchform from '@widgets/sys-role-permission/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class SysRolePermissionGridView extends SysRolePermissionGridViewBase {
}
</script>
\ No newline at end of file
app_web/src/service/sys-role-permission/sys-role-permission-service-base.ts
浏览文件 @ b2cf0255
......@@ -244,26 +244,4 @@ export default class SysRolePermissionServiceBase extends EntityService {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/sysrolepermissions/fetchdefault`,tempData,isloading);
}
/**
* FetchPermissionenable1接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof SysRolePermissionServiceBase
*/
public async FetchPermissionenable1(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
if(context.sysrole && true){
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/sysroles/${context.sysrole}/sysrolepermissions/fetchpermissionenable1`,tempData,isloading);
}
if(context.syspermission && true){
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/syspermissions/${context.syspermission}/sysrolepermissions/fetchpermissionenable1`,tempData,isloading);
}
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/sysrolepermissions/fetchpermissionenable1`,tempData,isloading);
}
}
\ No newline at end of file
app_web/src/store/modules/view-action/state.ts
浏览文件 @ b2cf0255
......@@ -127,7 +127,7 @@ export const viewstate: any = {
{
viewtag: '61a949e3c23ebdda724888662ded1478',
viewmodule: 'uaa',
viewname: 'SYS_ROLE_PERMISSIONGridView',
viewname: 'SysRolePermissionGridView',
viewaction: '',
viewdatachange: false,
refviews: [
......
app_web/src/widgets/sys-role-permission/default-drbar/default-drbar-model.ts
浏览文件 @ b2cf0255
......@@ -30,6 +30,12 @@ export default class DefaultModel {
{
name: 'permissionname',
},
{
name: 'permissiontype',
},
{
name: 'permissionenable',
},
{
name: 'createdate',
},
......
app_web/src/widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ b2cf0255
......@@ -30,6 +30,12 @@ export default class MPickupViewpickupviewpanelModel {
{
name: 'permissionname',
},
{
name: 'permissiontype',
},
{
name: 'permissionenable',
},
{
name: 'createdate',
},
......
app_web/src/widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ b2cf0255
......@@ -30,6 +30,12 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'permissionname',
},
{
name: 'permissiontype',
},
{
name: 'permissionenable',
},
{
name: 'createdate',
},
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java
浏览文件 @ b2cf0255
......@@ -68,6 +68,8 @@ public class SysPermission extends EntityMP implements Serializable {
/**
* 逻辑有效
*/
@DEField(preType = DEPredefinedFieldType.LOGICVALID, logicval = "1" , logicdelval="0")
@TableLogic(value= "1",delval="0")
@TableField(value = "enable")
@JSONField(name = "enable")
@JsonProperty("enable")
......@@ -122,13 +124,6 @@ public class SysPermission extends EntityMP implements Serializable {
this.pssystemid = pssystemid ;
this.modify("pssystemid",pssystemid);
}
/**
* 设置 [逻辑有效]
*/
public void setEnable(Integer enable){
this.enable = enable ;
this.modify("enable",enable);
}
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java
浏览文件 @ b2cf0255
......@@ -73,6 +73,20 @@ public class SysRolePermission extends EntityMP implements Serializable {
@JSONField(name = "permissionname")
@JsonProperty("permissionname")
private String permissionname;
/**
* 权限类型
*/
@TableField(exist = false)
@JSONField(name = "permissiontype")
@JsonProperty("permissiontype")
private String permissiontype;
/**
* 权限类型
*/
@TableField(exist = false)
@JSONField(name = "permissionenable")
@JsonProperty("permissionenable")
private Integer permissionenable;
/**
* 建立时间
*/
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysRolePermissionMapper.java
浏览文件 @ b2cf0255
......@@ -20,7 +20,6 @@ import com.alibaba.fastjson.JSONObject;
public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission>{
Page<SysRolePermission> searchDefault(IPage page, @Param("srf") SysRolePermissionSearchContext context, @Param("ew") Wrapper<SysRolePermission> wrapper) ;
Page<SysRolePermission> searchPermissionenable1(IPage page, @Param("srf") SysRolePermissionSearchContext context, @Param("ew") Wrapper<SysRolePermission> wrapper) ;
@Override
SysRolePermission selectById(Serializable id);
@Override
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysRolePermissionService.java
浏览文件 @ b2cf0255
......@@ -37,7 +37,6 @@ public interface ISysRolePermissionService extends IService<SysRolePermission>{
boolean update(SysRolePermission et) ;
void updateBatch(List<SysRolePermission> list) ;
Page<SysRolePermission> searchDefault(SysRolePermissionSearchContext context) ;
Page<SysRolePermission> searchPermissionenable1(SysRolePermissionSearchContext context) ;
List<SysRolePermission> selectByPermissionid(String permissionid) ;
void removeByPermissionid(String permissionid) ;
void saveByPermissionid(String permissionid,List<SysRolePermission> list) ;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java
浏览文件 @ b2cf0255
......@@ -236,15 +236,6 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
return new PageImpl<SysRolePermission>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 permissionenable1
*/
@Override
public Page<SysRolePermission> searchPermissionenable1(SysRolePermissionSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysRolePermission> pages=baseMapper.searchPermissionenable1(context.getPages(),context,context.getSelectCond());
return new PageImpl<SysRolePermission>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
......@@ -261,6 +252,8 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
permission=majorEntity;
}
et.setPermissionname(permission.getPermissionname());
et.setPermissiontype(permission.getPermissiontype());
et.setPermissionenable(permission.getEnable());
}
//实体关系[DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID]
if(!ObjectUtils.isEmpty(et.getRoleid())){
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ b2cf0255
......@@ -66,7 +66,7 @@
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-86-3">
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-91-3">
<createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
......@@ -124,7 +124,7 @@
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-209-6">
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-212-6">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
......@@ -209,7 +209,7 @@
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_PSDEOPPRIV]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-86-10">
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-91-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_PSSYSUNIRES]外键关系 -->
......
ibzuaa-core/src/main/resources/mapper/uaa/sysrolepermission/SysRolePermissionMapper.xml
浏览文件 @ b2cf0255
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="SysRolePermissionResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID ) t1 where sys_role_permissionid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t21.`ENABLE` AS `PERMISSIONENABLE`, t21.`PERMISSIONTYPE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID ) t1 where sys_role_permissionid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -47,31 +47,15 @@
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[Permissionenable1]-->
<select id="searchPermissionenable1" parameterType="cn.ibizlab.core.uaa.filter.SysRolePermissionSearchContext" resultMap="SysRolePermissionResultMap">
select t1.* from (
<include refid="Permissionenable1" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID
]]>
</sql>
<!--数据查询[Permissionenable1]-->
<sql id="Permissionenable1" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID
WHERE ( t11.enable=1 )
<![CDATA[ SELECT t1.`CREATEDATE`, t21.`ENABLE` AS `PERMISSIONENABLE`, t21.`PERMISSIONTYPE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID
<![CDATA[ SELECT t1.`CREATEDATE`, t21.`ENABLE` AS `PERMISSIONENABLE`, t21.`PERMISSIONTYPE`, t1.`SYS_PERMISSIONID`, t21.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t11.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 LEFT JOIN IBZROLE t11 ON t1.SYS_ROLEID = t11.SYS_ROLEID LEFT JOIN IBZPERMISSION t21 ON t1.SYS_PERMISSIONID = t21.SYS_PERMISSIONID
]]>
</sql>
......
ibzuaa-core/src/main/resources/permission/systemResource.json
浏览文件 @ b2cf0255
......@@ -14,7 +14,7 @@
"dename":"SysRolePermission",
"delogicname":"角色权限关系",
"sysmoudle":{"id":"UAA","name":"uaa"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"Permissionenable1" , "name":"permissionenable1"}],
"dedataset":[{"id":"Default" , "name":"DEFAULT"}],
"deaction":[{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}]
}
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysPermissionDTO.java
浏览文件 @ b2cf0255
......@@ -106,14 +106,6 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
this.modify("pssystemid",pssystemid);
}
/**
* 设置 [ENABLE]
*/
public void setEnable(Integer enable){
this.enable = enable ;
this.modify("enable",enable);
}
}
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysRolePermissionDTO.java
浏览文件 @ b2cf0255
......@@ -63,6 +63,22 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
@JsonProperty("permissionname")
private String permissionname;
/**
* 属性 [PERMISSIONTYPE]
*
*/
@JSONField(name = "permissiontype")
@JsonProperty("permissiontype")
private String permissiontype;
/**
* 属性 [PERMISSIONENABLE]
*
*/
@JSONField(name = "permissionenable")
@JsonProperty("permissionenable")
private Integer permissionenable;
/**
* 属性 [CREATEDATE]
*
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SysRolePermissionResource.java
浏览文件 @ b2cf0255
......@@ -161,27 +161,6 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "fetchpermissionenable1", tags = {"SysRolePermission" } ,notes = "fetchpermissionenable1")
@RequestMapping(method= RequestMethod.GET , value="/sysrolepermissions/fetchpermissionenable1")
public ResponseEntity<List<SysRolePermissionDTO>> fetchPermissionenable1(SysRolePermissionSearchContext context) {
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
List<SysRolePermissionDTO> list = sysrolepermissionMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "searchpermissionenable1", tags = {"SysRolePermission" } ,notes = "searchpermissionenable1")
@RequestMapping(method= RequestMethod.POST , value="/sysrolepermissions/searchpermissionenable1")
public ResponseEntity<Page<SysRolePermissionDTO>> searchPermissionenable1(@RequestBody SysRolePermissionSearchContext context) {
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Get-all')")
@ApiOperation(value = "GetBySysPermission", tags = {"SysRolePermission" }, notes = "GetBySysPermission")
@RequestMapping(method = RequestMethod.GET, value = "/syspermissions/{syspermission_id}/sysrolepermissions/{sysrolepermission_id}")
......@@ -316,29 +295,6 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "fetchpermissionenable1BySysPermission", tags = {"SysRolePermission" } ,notes = "fetchpermissionenable1BySysPermission")
@RequestMapping(method= RequestMethod.GET , value="/syspermissions/{syspermission_id}/sysrolepermissions/fetchpermissionenable1")
public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionPermissionenable1BySysPermission(@PathVariable("syspermission_id") String syspermission_id,SysRolePermissionSearchContext context) {
context.setN_sys_permissionid_eq(syspermission_id);
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
List<SysRolePermissionDTO> list = sysrolepermissionMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "searchpermissionenable1BySysPermission", tags = {"SysRolePermission" } ,notes = "searchpermissionenable1BySysPermission")
@RequestMapping(method= RequestMethod.POST , value="/syspermissions/{syspermission_id}/sysrolepermissions/searchpermissionenable1")
public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionPermissionenable1BySysPermission(@PathVariable("syspermission_id") String syspermission_id, @RequestBody SysRolePermissionSearchContext context) {
context.setN_sys_permissionid_eq(syspermission_id);
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Get-all')")
@ApiOperation(value = "GetBySysRole", tags = {"SysRolePermission" }, notes = "GetBySysRole")
@RequestMapping(method = RequestMethod.GET, value = "/sysroles/{sysrole_id}/sysrolepermissions/{sysrolepermission_id}")
......@@ -473,27 +429,4 @@ public class SysRolePermissionResource {
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "fetchpermissionenable1BySysRole", tags = {"SysRolePermission" } ,notes = "fetchpermissionenable1BySysRole")
@RequestMapping(method= RequestMethod.GET , value="/sysroles/{sysrole_id}/sysrolepermissions/fetchpermissionenable1")
public ResponseEntity<List<SysRolePermissionDTO>> fetchSysRolePermissionPermissionenable1BySysRole(@PathVariable("sysrole_id") String sysrole_id,SysRolePermissionSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id);
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
List<SysRolePermissionDTO> list = sysrolepermissionMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzuaa-SysRolePermission-Permissionenable1-all')")
@ApiOperation(value = "searchpermissionenable1BySysRole", tags = {"SysRolePermission" } ,notes = "searchpermissionenable1BySysRole")
@RequestMapping(method= RequestMethod.POST , value="/sysroles/{sysrole_id}/sysrolepermissions/searchpermissionenable1")
public ResponseEntity<Page<SysRolePermissionDTO>> searchSysRolePermissionPermissionenable1BySysRole(@PathVariable("sysrole_id") String sysrole_id, @RequestBody SysRolePermissionSearchContext context) {
context.setN_sys_roleid_eq(sysrole_id);
Page<SysRolePermission> domains = sysrolepermissionService.searchPermissionenable1(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(sysrolepermissionMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或