ibizdev提交

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSSYSUNIRES.java

@@ -37,25 +37,24 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
      */
     @DEField(name = "sys_pssysuniresid" , isKeyField=true)
     @TableId(value= "sys_pssysuniresid",type=IdType.UUID)
-    @JSONField(name = "sys_pssysuniresid")
-    @JsonProperty("sys_pssysuniresid")
-    private String sysPssysuniresid;
+    @JSONField(name = "uniresid")
+    @JsonProperty("uniresid")
+    private String uniresid;
     /**
      * 实体2名称
      */
     @DEField(name = "sys_pssysuniresname")
     @TableField(value = "sys_pssysuniresname")
-    @JSONField(name = "sys_pssysuniresname")
-    @JsonProperty("sys_pssysuniresname")
-    private String sysPssysuniresname;
+    @JSONField(name = "uniresname")
+    @JsonProperty("uniresname")
+    private String uniresname;
     /**
-     * 建立人
+     * 资源代码
      */
-    @DEField(preType = DEPredefinedFieldType.CREATEMAN)
-    @TableField(value = "createman" , fill = FieldFill.INSERT)
-    @JSONField(name = "createman")
-    @JsonProperty("createman")
-    private String createman;
+    @TableField(value = "unirescode")
+    @JSONField(name = "unirescode")
+    @JsonProperty("unirescode")
+    private String unirescode;
     /**
      * 建立时间
      */
@@ -65,14 +64,6 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
     private Timestamp createdate;
-    /**
-     * 更新人
-     */
-    @DEField(preType = DEPredefinedFieldType.UPDATEMAN)
-    @TableField(value = "updateman")
-    @JSONField(name = "updateman")
-    @JsonProperty("updateman")
-    private String updateman;
     /**
      * 更新时间
      */
@@ -82,22 +73,15 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
-    /**
-     * 资源代码
-     */
-    @TableField(value = "unirescode")
-    @JSONField(name = "unirescode")
-    @JsonProperty("unirescode")
-    private String unirescode;
 
 
 
     /**
      * 设置 [实体2名称]
      */
-    public void setSysPssysuniresname(String sysPssysuniresname){
-        this.sysPssysuniresname = sysPssysuniresname ;
-        this.modify("sys_pssysuniresname",sysPssysuniresname);
+    public void setUniresname(String uniresname){
+        this.uniresname = uniresname ;
+        this.modify("sys_pssysuniresname",uniresname);
     }
     /**
      * 设置 [资源代码]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PSSYSUNIRESServiceImpl.java

@@ -50,9 +50,9 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
     @Override
     @Transactional
     public boolean update(SYS_PSSYSUNIRES et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("sys_pssysuniresid",et.getSysPssysuniresid())))
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("sys_pssysuniresid",et.getUniresid())))
             return false;
-        CachedBeanCopier.copy(get(et.getSysPssysuniresid()),et);
+        CachedBeanCopier.copy(get(et.getUniresid()),et);
         return true;
     }
 
@@ -88,7 +88,7 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
 
     @Override
     public boolean checkKey(SYS_PSSYSUNIRES et) {
-        return (!ObjectUtils.isEmpty(et.getSysPssysuniresid()))&&(!Objects.isNull(this.getById(et.getSysPssysuniresid())));
+        return (!ObjectUtils.isEmpty(et.getUniresid()))&&(!Objects.isNull(this.getById(et.getUniresid())));
     }
 
     @Override
@@ -114,7 +114,7 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
         SYS_PSSYSUNIRES et = getById(key);
         if(et==null){
             et=new SYS_PSSYSUNIRES();
-            et.setSysPssysuniresid(key);
+            et.setUniresid(key);
         }
         else{
         }
@@ -126,7 +126,7 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
     public boolean create(SYS_PSSYSUNIRES et) {
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
-        CachedBeanCopier.copy(get(et.getSysPssysuniresid()),et);
+        CachedBeanCopier.copy(get(et.getUniresid()),et);
         return true;
     }
 

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -74,23 +74,19 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PSSYSUNIRES]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-78-4">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-89-4">
         <createTable tableName="IBZPSSYSUNIRES">
                 <column name="SYS_PSSYSUNIRESID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSUNIRES_SYS_PSSYSUN"/>
                 </column>
                 <column name="SYS_PSSYSUNIRESNAME" remarks="" type="VARCHAR(200)">
                 </column>
-                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
+                <column name="UNIRESCODE" remarks="" type="VARCHAR(100)">
                 </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
-                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
-                <column name="UNIRESCODE" remarks="" type="VARCHAR(100)">
-                </column>
         </createTable>
     </changeSet>
     <!--输出实体[SYS_USER_ROLE]数据结构 -->

ibzuaa-core/src/main/resources/liquibase/view.xml

 <?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_PSSYSUNIRES]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_A_5d9d78509" id="view-sys_pssysunires-78-1" runOnChange="true">
+     <changeSet author="a_A_5d9d78509" id="view-sys_pssysunires-89-1" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_SYS_PSSYSUNIRES">
-               <![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`SYS_PSSYSUNIRESID`, t1.`SYS_PSSYSUNIRESNAME`, t1.`UNIRESCODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZPSSYSUNIRES` t1  ]]>
+               <![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYS_PSSYSUNIRESID`, t1.`SYS_PSSYSUNIRESNAME`, t1.`UNIRESCODE`, t1.`UPDATEDATE` FROM `IBZPSSYSUNIRES` t1  ]]>
          </createView>
      </changeSet>
 

ibzuaa-core/src/main/resources/mapper/uaa/sys_pssysunires/SYS_PSSYSUNIRESMapper.xml

@@ -10,8 +10,8 @@
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="SYS_PSSYSUNIRESResultMap" type="cn.ibizlab.core.uaa.domain.SYS_PSSYSUNIRES" autoMapping="true">
-        <id property="sysPssysuniresid" column="sys_pssysuniresid" /><!--主键字段映射-->
-		<result property="sysPssysuniresname" column="sys_pssysuniresname" />
+        <id property="uniresid" column="sys_pssysuniresid" /><!--主键字段映射-->
+		<result property="uniresname" column="sys_pssysuniresname" />
             
 		
     </resultMap>
@@ -28,7 +28,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`SYS_PSSYSUNIRESID`, t1.`SYS_PSSYSUNIRESNAME`, t1.`UNIRESCODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZPSSYSUNIRES` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`SYS_PSSYSUNIRESID`, t1.`SYS_PSSYSUNIRESNAME`, t1.`UNIRESCODE`, t1.`UPDATEDATE` FROM `IBZPSSYSUNIRES` t1  
 			]]>
     </sql>