ibizdev提交

1b27b217 · ibizdev · 00b16f80 · 1b27b217 · 1b27b217 · 1b27b217
--- a/app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_en_US.ts
+++ b/app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_en_US.ts
@@ -6,10 +6,10 @@ export default {
    psappid: '业务系统应用标识',
    psappname: '业务系统应用名称',
    psappmenuid: '业务系统菜单标识',
+    psappmenuitemid: '业务系统菜单项标识',
+    psapppmenuitemid: '业务系统父菜单项标识',
    psappmenuname: '业务系统菜单名称',
    pssystemid: '业务系统标识',
-    permissionid: '业务系统菜单项标识',
-    parentpermissionid: '业务系统父菜单项标识',
    createdate: '建立时间',
    updatedate: '更新时间',
  },

--- a/app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_zh_CN.ts
+++ b/app_web/src/locale/lanres/sys-psappmenuitem/sys-psappmenuitem_zh_CN.ts
@@ -5,10 +5,10 @@ export default {
    psappid: '业务系统应用标识',
    psappname: '业务系统应用名称',
    psappmenuid: '业务系统菜单标识',
+    psappmenuitemid: '业务系统菜单项标识',
+    psapppmenuitemid: '业务系统父菜单项标识',
    psappmenuname: '业务系统菜单名称',
    pssystemid: '业务系统标识',
-    permissionid: '业务系统菜单项标识',
-    parentpermissionid: '业务系统父菜单项标识',
    createdate: '建立时间',
    updatedate: '更新时间',
  },

--- a/ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
+++ b/ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSAPPMENUITEM.java
@@ -69,6 +69,20 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
    @JSONField(name = "psappmenuid")
    @JsonProperty("psappmenuid")
    private String psappmenuid;
+    /**
+     * 业务系统菜单项标识
+     */
+    @TableField(value = "psappmenuitemid")
+    @JSONField(name = "psappmenuitemid")
+    @JsonProperty("psappmenuitemid")
+    private String psappmenuitemid;
+    /**
+     * 业务系统父菜单项标识
+     */
+    @TableField(value = "psapppmenuitemid")
+    @JSONField(name = "psapppmenuitemid")
+    @JsonProperty("psapppmenuitemid")
+    private String psapppmenuitemid;
    /**
     * 业务系统菜单名称
     */
@@ -83,21 +97,6 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
    @JSONField(name = "pssystemid")
    @JsonProperty("pssystemid")
    private String pssystemid;
-    /**
-     * 业务系统菜单项标识
-     */
-    @TableField(value = "permissionid")
-    @JSONField(name = "permissionid")
-    @JsonProperty("permissionid")
-    private String permissionid;
-    /**
-     * 业务系统父菜单项标识
-     */
-    @DEField(name = "p_permissionid")
-    @TableField(value = "p_permissionid")
-    @JSONField(name = "parentpermissionid")
-    @JsonProperty("parentpermissionid")
-    private String parentpermissionid;
    /**
     * 建立时间
     */
@@ -147,6 +146,20 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
        this.psappmenuid = psappmenuid ;
        this.modify("psappmenuid",psappmenuid);
    }
+    /**
+     * 设置 [业务系统菜单项标识]
+     */
+    public void setPsappmenuitemid(String psappmenuitemid){
+        this.psappmenuitemid = psappmenuitemid ;
+        this.modify("psappmenuitemid",psappmenuitemid);
+    }
+    /**
+     * 设置 [业务系统父菜单项标识]
+     */
+    public void setPsapppmenuitemid(String psapppmenuitemid){
+        this.psapppmenuitemid = psapppmenuitemid ;
+        this.modify("psapppmenuitemid",psapppmenuitemid);
+    }
    /**
     * 设置 [业务系统菜单名称]
     */
@@ -161,20 +174,6 @@ public class SYS_PSAPPMENUITEM extends EntityMP implements Serializable {
        this.pssystemid = pssystemid ;
        this.modify("pssystemid",pssystemid);
    }
-    /**
-     * 设置 [业务系统菜单项标识]
-     */
-    public void setPermissionid(String permissionid){
-        this.permissionid = permissionid ;
-        this.modify("permissionid",permissionid);
-    }
-    /**
-     * 设置 [业务系统父菜单项标识]
-     */
-    public void setParentpermissionid(String parentpermissionid){
-        this.parentpermissionid = parentpermissionid ;
-        this.modify("p_permissionid",parentpermissionid);
-    }
 }



--- a/ibzuaa-core/src/main/resources/liquibase/h2_table.xml
+++ b/ibzuaa-core/src/main/resources/liquibase/h2_table.xml
@@ -158,7 +158,7 @@
        </createTable>
    </changeSet>
    <!--输出实体[SYS_PSAPPMENUITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-56-9">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_psappmenuitem-98-9">
        <createTable tableName="IBZPSAPPMENUITEM">
                <column name="SYS_PSAPPMENUITEMID" remarks="" type="VARCHAR(200)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSAPPMENUITEM_SYS_PSAPP"/>
@@ -171,13 +171,13 @@
                </column>
                <column name="PSAPPMENUID" remarks="" type="VARCHAR(100)">
                </column>
-                <column name="PSAPPMENUNAME" remarks="" type="VARCHAR(100)">
+                <column name="PSAPPMENUITEMID" remarks="" type="VARCHAR(100)">
                </column>
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
+                <column name="PSAPPPMENUITEMID" remarks="" type="VARCHAR(100)">
                </column>
-                <column name="PERMISSIONID" remarks="" type="VARCHAR(100)">
+                <column name="PSAPPMENUNAME" remarks="" type="VARCHAR(100)">
                </column>
-                <column name="P_PERMISSIONID" remarks="" type="VARCHAR(100)">
+                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                </column>
                <column name="CREATEDATE" remarks="" type="DATETIME">
                </column>

--- a/ibzuaa-core/src/main/resources/mapper/uaa/sys_psappmenuitem/SYS_PSAPPMENUITEMMapper.xml
+++ b/ibzuaa-core/src/main/resources/mapper/uaa/sys_psappmenuitem/SYS_PSAPPMENUITEMMapper.xml
@@ -9,7 +9,6 @@
    <resultMap id="SYS_PSAPPMENUITEMResultMap" type="cn.ibizlab.core.uaa.domain.SYS_PSAPPMENUITEM" autoMapping="true">
        <id property="appmenuitemid" column="sys_psappmenuitemid" /><!--主键字段映射-->
 		<result property="appmenuitemname" column="sys_psappmenuitemname" />
-		<result property="parentpermissionid" column="p_permissionid" />
            
 		
    </resultMap>
@@ -26,7 +25,7 @@

    <!--数据查询[Default]-->
    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`PERMISSIONID`, t1.`PSAPPID`, t1.`PSAPPMENUID`, t1.`PSAPPMENUNAME`, t1.`PSAPPNAME`, t1.`PSSYSTEMID`, t1.`P_PERMISSIONID`, t1.`SYS_PSAPPMENUITEMID`, t1.`SYS_PSAPPMENUITEMNAME`, t1.`UPDATEDATE` FROM `IBZPSAPPMENUITEM` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`PSAPPID`, t1.`PSAPPMENUID`, t1.`PSAPPMENUITEMID`, t1.`PSAPPMENUNAME`, t1.`PSAPPNAME`, t1.`PSAPPPMENUITEMID`, t1.`PSSYSTEMID`, t1.`SYS_PSAPPMENUITEMID`, t1.`SYS_PSAPPMENUITEMNAME`, t1.`UPDATEDATE` FROM `IBZPSAPPMENUITEM` t1  
 			]]>
    </sql>


--- a/ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PSAPPMENUITEMDTO.java
+++ b/ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PSAPPMENUITEMDTO.java
@@ -64,36 +64,36 @@ public class SYS_PSAPPMENUITEMDTO extends DTOBase implements Serializable {
    private String psappmenuid;

    /**
-     * 属性 [PSAPPMENUNAME]
+     * 属性 [PSAPPMENUITEMID]
     *
     */
-    @JSONField(name = "psappmenuname")
-    @JsonProperty("psappmenuname")
-    private String psappmenuname;
+    @JSONField(name = "psappmenuitemid")
+    @JsonProperty("psappmenuitemid")
+    private String psappmenuitemid;

    /**
-     * 属性 [PSSYSTEMID]
+     * 属性 [PSAPPPMENUITEMID]
     *
     */
-    @JSONField(name = "pssystemid")
-    @JsonProperty("pssystemid")
-    private String pssystemid;
+    @JSONField(name = "psapppmenuitemid")
+    @JsonProperty("psapppmenuitemid")
+    private String psapppmenuitemid;

    /**
-     * 属性 [PERMISSIONID]
+     * 属性 [PSAPPMENUNAME]
     *
     */
-    @JSONField(name = "permissionid")
-    @JsonProperty("permissionid")
-    private String permissionid;
+    @JSONField(name = "psappmenuname")
+    @JsonProperty("psappmenuname")
+    private String psappmenuname;

    /**
-     * 属性 [P_PERMISSIONID]
+     * 属性 [PSSYSTEMID]
     *
     */
-    @JSONField(name = "parentpermissionid")
-    @JsonProperty("parentpermissionid")
-    private String parentpermissionid;
+    @JSONField(name = "pssystemid")
+    @JsonProperty("pssystemid")
+    private String pssystemid;

    /**
     * 属性 [CREATEDATE]
@@ -147,35 +147,35 @@ public class SYS_PSAPPMENUITEMDTO extends DTOBase implements Serializable {
    }

    /**
-     * 设置 [PSAPPMENUNAME]
+     * 设置 [PSAPPMENUITEMID]
     */
-    public void setPsappmenuname(String  psappmenuname){
-        this.psappmenuname = psappmenuname ;
-        this.modify("psappmenuname",psappmenuname);
+    public void setPsappmenuitemid(String  psappmenuitemid){
+        this.psappmenuitemid = psappmenuitemid ;
+        this.modify("psappmenuitemid",psappmenuitemid);
    }

    /**
-     * 设置 [PSSYSTEMID]
+     * 设置 [PSAPPPMENUITEMID]
     */
-    public void setPssystemid(String  pssystemid){
-        this.pssystemid = pssystemid ;
-        this.modify("pssystemid",pssystemid);
+    public void setPsapppmenuitemid(String  psapppmenuitemid){
+        this.psapppmenuitemid = psapppmenuitemid ;
+        this.modify("psapppmenuitemid",psapppmenuitemid);
    }

    /**
-     * 设置 [PERMISSIONID]
+     * 设置 [PSAPPMENUNAME]
     */
-    public void setPermissionid(String  permissionid){
-        this.permissionid = permissionid ;
-        this.modify("permissionid",permissionid);
+    public void setPsappmenuname(String  psappmenuname){
+        this.psappmenuname = psappmenuname ;
+        this.modify("psappmenuname",psappmenuname);
    }

    /**
-     * 设置 [P_PERMISSIONID]
+     * 设置 [PSSYSTEMID]
     */
-    public void setParentpermissionid(String  parentpermissionid){
-        this.parentpermissionid = parentpermissionid ;
-        this.modify("p_permissionid",parentpermissionid);
+    public void setPssystemid(String  pssystemid){
+        this.pssystemid = pssystemid ;
+        this.modify("pssystemid",pssystemid);
    }