Skip to content

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

ibiz4j 发布系统代码

上级 6673a6a6
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 207 行删除
app_web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
浏览文件 @ b3066d9f
......@@ -4,10 +4,10 @@ export default {
roleid: "角色标识",
rolename: "角色名称",
memo: "备注",
createdate: "建立时间",
updatedate: "更新时间",
proleid: "父角色标识",
prolename: "父角色名称",
createdate: "建立时间",
updatedate: "更新时间",
},
views: {
pickupgridview: {
......
app_web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
浏览文件 @ b3066d9f
......@@ -3,10 +3,10 @@ export default {
roleid: "角色标识",
rolename: "角色名称",
memo: "备注",
createdate: "建立时间",
updatedate: "更新时间",
proleid: "父角色标识",
prolename: "父角色名称",
createdate: "建立时间",
updatedate: "更新时间",
},
views: {
pickupgridview: {
......
app_web/src/widgets/sys-role/default-drbar/default-drbar-model.ts
浏览文件 @ b3066d9f
......@@ -25,16 +25,16 @@ export default class DefaultModel {
name: 'memo',
},
{
name: 'createdate',
name: 'proleid',
},
{
name: 'updatedate',
name: 'prolename',
},
{
name: 'proleid',
name: 'createdate',
},
{
name: 'prolename',
name: 'updatedate',
},
]
}
......
app_web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @ b3066d9f
......@@ -6,14 +6,14 @@
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus" :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sysrole.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.sys_rolename.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<i-col v-show="detailsModel.sys_rolename.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='sys_rolename' :itemRules="this.rules().sys_rolename" class='' :caption="$t('entities.sysrole.main_form.details.sys_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.sys_rolename" @enter="onEnter($event)" unit="" :disabled="detailsModel.sys_rolename.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.prolename.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<i-col v-show="detailsModel.prolename.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='prolename' :itemRules="this.rules().prolename" class='' :caption="$t('entities.sysrole.main_form.details.prolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.prolename.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
......@@ -40,7 +40,7 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.memo.visible" :style="{}" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<i-col v-show="detailsModel.memo.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='memo' :itemRules="this.rules().memo" class='' :caption="$t('entities.sysrole.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.memo" @enter="onEnter($event)" unit="" :disabled="detailsModel.memo.disabled" type='text' style=""></input-box>
......
app_web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ b3066d9f
......@@ -25,16 +25,16 @@ export default class MPickupViewpickupviewpanelModel {
name: 'memo',
},
{
name: 'createdate',
name: 'proleid',
},
{
name: 'updatedate',
name: 'prolename',
},
{
name: 'proleid',
name: 'createdate',
},
{
name: 'prolename',
name: 'updatedate',
},
]
}
......
app_web/src/widgets/sys-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ b3066d9f
......@@ -25,16 +25,16 @@ export default class PickupViewpickupviewpanelModel {
name: 'memo',
},
{
name: 'createdate',
name: 'proleid',
},
{
name: 'updatedate',
name: 'prolename',
},
{
name: 'proleid',
name: 'createdate',
},
{
name: 'prolename',
name: 'updatedate',
},
]
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
浏览文件 @ b3066d9f
......@@ -63,6 +63,20 @@ public class SysRole extends EntityMP implements Serializable {
@JSONField(name = "memo")
@JsonProperty("memo")
private String memo;
/**
* 父角色标识
*/
@TableField(value = "proleid")
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 父角色名称
*/
@TableField(exist = false)
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
* 建立时间
*/
......@@ -81,28 +95,14 @@ public class SysRole extends EntityMP implements Serializable {
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 父角色标识
*/
@TableField(value = "proleid")
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 父角色名称
*/
@TableField(exist = false)
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
*
* 父角色
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.uaa.domain.SysRole psysRole;
private cn.ibizlab.core.uaa.domain.SysRole parent;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java
浏览文件 @ b3066d9f
......@@ -185,13 +185,13 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
private void fillParentData(SysRole et){
//实体关系[DER1N_SYS_ROLE_SYS_ROLE_PROLEID]
if(!ObjectUtils.isEmpty(et.getProleid())){
cn.ibizlab.core.uaa.domain.SysRole psysRole=et.getPsysRole();
if(ObjectUtils.isEmpty(psysRole)){
cn.ibizlab.core.uaa.domain.SysRole parent=et.getParent();
if(ObjectUtils.isEmpty(parent)){
cn.ibizlab.core.uaa.domain.SysRole majorEntity=sysroleService.get(et.getProleid());
et.setPsysRole(majorEntity);
psysRole=majorEntity;
et.setParent(majorEntity);
parent=majorEntity;
}
et.setProlename(psysRole.getRolename());
et.setProlename(parent.getRolename());
}
}
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ b3066d9f
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[SYS_AUTHLOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_authlog-40-1">
<createTable tableName="IBZAUTHLOG">
<column name="LOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAIN" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHTIME" remarks="" type="DATETIME">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="MACADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="USERAGENT" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHCODE" remarks="" type="VARCHAR(15)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-39-2">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
</column>
<column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
</column>
<column name="APPS" remarks="" type="TEXT(1048576)">
</column>
<column name="MD5CHECK" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-3">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
</column>
<column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-108-4">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
</column>
<column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
<column name="PROLEID" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-98-5">
<createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-72-6">
<createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_USERID" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_PSSYSTEM]外键关系 -->
<!--输出实体[SYS_PERMISSION]外键关系 -->
<!--输出实体[SYS_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role-108-7">
<addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-8">
<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_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-10">
<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>
</databaseChangeLog>
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
----
\ No newline at end of file
ibzuaa-core/src/main/resources/mapper/uaa/sysrole/SysRoleMapper.xml
浏览文件 @ b3066d9f
......@@ -13,7 +13,7 @@
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="psysRole" javaType="cn.ibizlab.core.uaa.domain.SysRole" column="proleid" select="cn.ibizlab.core.uaa.mapper.SysRoleMapper.selectById" fetchType="lazy"></association>
<association property="parent" javaType="cn.ibizlab.core.uaa.domain.SysRole" column="proleid" select="cn.ibizlab.core.uaa.mapper.SysRoleMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_SYS_ROLE_SYS_ROLE_PROLEID] -->
......@@ -40,7 +40,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CREATEDATE, t1.MEMO, t1.SYS_ROLEID, t1.SYS_ROLENAME, t1.UPDATEDATE FROM IBZROLE t1
<![CDATA[ SELECT t1.CREATEDATE, t1.MEMO, t1.PROLEID, t11.SYS_ROLENAME AS PROLENAME, t1.SYS_ROLEID, t1.SYS_ROLENAME, t1.UPDATEDATE FROM IBZROLE t1 LEFT JOIN IBZROLE t11 ON t1.PROLEID = t11.SYS_ROLEID
]]>
</sql>
<!--数据查询[Default]-->
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysRoleDTO.java
浏览文件 @ b3066d9f
......@@ -47,6 +47,22 @@ public class SysRoleDTO extends DTOBase implements Serializable {
@JsonProperty("memo")
private String memo;
/**
* 属性 [PROLEID]
*
*/
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 属性 [PROLENAME]
*
*/
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
* 属性 [CREATEDATE]
*
......@@ -65,22 +81,6 @@ public class SysRoleDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 属性 [PROLEID]
*
*/
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 属性 [PROLENAME]
*
*/
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
* 设置 [SYS_ROLENAME]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或