ibizdev提交

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

@@ -24,16 +24,16 @@ import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
 /**
- * 实体[统一资源]
+ * 实体[实体2]
  */
 @Data
-@TableName(value = "T_SYS_PSSYSUNIRES",resultMap = "SYS_PSSYSUNIRESResultMap")
+@TableName(value = "IBZPSSYSUNIRES",resultMap = "SYS_PSSYSUNIRESResultMap")
 public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 统一资源标识
+     * 实体2标识
      */
     @DEField(name = "sys_pssysuniresid" , isKeyField=true)
     @TableId(value= "sys_pssysuniresid",type=IdType.UUID)
@@ -41,13 +41,21 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
     @JsonProperty("sys_pssysuniresid")
     private String sysPssysuniresid;
     /**
-     * 统一资源名称
+     * 实体2名称
      */
     @DEField(name = "sys_pssysuniresname")
     @TableField(value = "sys_pssysuniresname")
     @JSONField(name = "sys_pssysuniresname")
     @JsonProperty("sys_pssysuniresname")
     private String sysPssysuniresname;
+    /**
+     * 建立人
+     */
+    @DEField(preType = DEPredefinedFieldType.CREATEMAN)
+    @TableField(value = "createman" , fill = FieldFill.INSERT)
+    @JSONField(name = "createman")
+    @JsonProperty("createman")
+    private String createman;
     /**
      * 建立时间
      */
@@ -74,14 +82,6 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
     private Timestamp updatedate;
-    /**
-     * 建立人
-     */
-    @DEField(preType = DEPredefinedFieldType.CREATEMAN)
-    @TableField(value = "createman" , fill = FieldFill.INSERT)
-    @JSONField(name = "createman")
-    @JsonProperty("createman")
-    private String createman;
     /**
      * 资源代码
      */
@@ -93,7 +93,7 @@ public class SYS_PSSYSUNIRES extends EntityMP implements Serializable {
 
 
     /**
-     * 设置 [统一资源名称]
+     * 设置 [实体2名称]
      */
     public void setSysPssysuniresname(String sysPssysuniresname){
         this.sysPssysuniresname = sysPssysuniresname ;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PSSYSUNIRESSearchContext.java

@@ -27,7 +27,7 @@ import cn.ibizlab.core.uaa.domain.SYS_PSSYSUNIRES;
 @Data
 public class SYS_PSSYSUNIRESSearchContext extends QueryWrapperContext<SYS_PSSYSUNIRES> {
 
-	private String n_sys_pssysuniresname_like;//[统一资源名称]
+	private String n_sys_pssysuniresname_like;//[实体2名称]
 	public void setN_sys_pssysuniresname_like(String n_sys_pssysuniresname_like) {
         this.n_sys_pssysuniresname_like = n_sys_pssysuniresname_like;
         if(!ObjectUtils.isEmpty(this.n_sys_pssysuniresname_like)){

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

@@ -24,17 +24,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISYS_PSSYSUNIRESService extends IService<SYS_PSSYSUNIRES>{
 
-    SYS_PSSYSUNIRES get(String key) ;
+    boolean update(SYS_PSSYSUNIRES et) ;
+    void updateBatch(List<SYS_PSSYSUNIRES> list) ;
     boolean save(SYS_PSSYSUNIRES et) ;
     void saveBatch(List<SYS_PSSYSUNIRES> list) ;
-    boolean create(SYS_PSSYSUNIRES et) ;
-    void createBatch(List<SYS_PSSYSUNIRES> list) ;
-    SYS_PSSYSUNIRES getDraft(SYS_PSSYSUNIRES et) ;
     boolean checkKey(SYS_PSSYSUNIRES et) ;
     boolean remove(String key) ;
     void removeBatch(Collection<String> idList) ;
-    boolean update(SYS_PSSYSUNIRES et) ;
-    void updateBatch(List<SYS_PSSYSUNIRES> list) ;
+    SYS_PSSYSUNIRES getDraft(SYS_PSSYSUNIRES et) ;
+    SYS_PSSYSUNIRES get(String key) ;
+    boolean create(SYS_PSSYSUNIRES et) ;
+    void createBatch(List<SYS_PSSYSUNIRES> list) ;
     Page<SYS_PSSYSUNIRES> searchDefault(SYS_PSSYSUNIRESSearchContext context) ;
 
 

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

@@ -38,7 +38,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
- * 实体[统一资源] 服务对象接口实现
+ * 实体[实体2] 服务对象接口实现
  */
 @Slf4j
 @Service("SYS_PSSYSUNIRESServiceImpl")
@@ -48,15 +48,16 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
 
     @Override
     @Transactional
-    public SYS_PSSYSUNIRES get(String key) {
-        SYS_PSSYSUNIRES et = getById(key);
-        if(et==null){
-            et=new SYS_PSSYSUNIRES();
-            et.setSysPssysuniresid(key);
-        }
-        else{
+    public boolean update(SYS_PSSYSUNIRES et) {
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("sys_pssysuniresid",et.getSysPssysuniresid())))
+            return false;
+        CachedBeanCopier.copy(get(et.getSysPssysuniresid()),et);
+        return true;
     }
-        return et;
+
+    @Override
+    public void updateBatch(List<SYS_PSSYSUNIRES> list) {
+        updateBatchById(list,batchSize);
     }
 
     @Override
@@ -84,25 +85,6 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
         saveOrUpdateBatch(list,batchSize);
     }
 
-    @Override
-    @Transactional
-    public boolean create(SYS_PSSYSUNIRES et) {
-        if(!this.retBool(this.baseMapper.insert(et)))
-            return false;
-        CachedBeanCopier.copy(get(et.getSysPssysuniresid()),et);
-        return true;
-    }
-
-    @Override
-    public void createBatch(List<SYS_PSSYSUNIRES> list) {
-        saveBatch(list,batchSize);
-    }
-
-    @Override
-    public SYS_PSSYSUNIRES getDraft(SYS_PSSYSUNIRES et) {
-        return et;
-    }
-
     @Override
     public boolean checkKey(SYS_PSSYSUNIRES et) {
         return (!ObjectUtils.isEmpty(et.getSysPssysuniresid()))&&(!Objects.isNull(this.getById(et.getSysPssysuniresid())));
@@ -120,18 +102,36 @@ public class SYS_PSSYSUNIRESServiceImpl extends ServiceImpl<SYS_PSSYSUNIRESMappe
         removeByIds(idList);
     }
 
+    @Override
+    public SYS_PSSYSUNIRES getDraft(SYS_PSSYSUNIRES et) {
+        return et;
+    }
+
     @Override
     @Transactional
-    public boolean update(SYS_PSSYSUNIRES et) {
-        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("sys_pssysuniresid",et.getSysPssysuniresid())))
+    public SYS_PSSYSUNIRES get(String key) {
+        SYS_PSSYSUNIRES et = getById(key);
+        if(et==null){
+            et=new SYS_PSSYSUNIRES();
+            et.setSysPssysuniresid(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(SYS_PSSYSUNIRES et) {
+        if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getSysPssysuniresid()),et);
         return true;
     }
 
     @Override
-    public void updateBatch(List<SYS_PSSYSUNIRES> list) {
-        updateBatchById(list,batchSize);
+    public void createBatch(List<SYS_PSSYSUNIRES> list) {
+        saveBatch(list,batchSize);
     }
 
 

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

@@ -73,15 +73,15 @@
                 </column>
         </createTable>
     </changeSet>
-    <!--输出实体[IBZPSSYSUNIRES]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzpssysunires-59-4">
+    <!--输出实体[SYS_PSSYSUNIRES]数据结构 -->
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssysunires-76-4">
         <createTable tableName="IBZPSSYSUNIRES">
-                <column name="IBZPSSYSUNIRESID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_IBZPSSYSUNIRES_IBZPSSYSUNIR"/>
+                <column name="SYS_PSSYSUNIRESID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSUNIRES_SYS_PSSYSUN"/>
                 </column>
-                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
+                <column name="SYS_PSSYSUNIRESNAME" remarks="" type="VARCHAR(200)">
                 </column>
-                <column name="IBZPSSYSUNIRESNAME" remarks="" type="VARCHAR(200)">
+                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -198,7 +198,7 @@
        <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]外键关系 -->
-        <!--输出实体[IBZPSSYSUNIRES]外键关系 -->
+        <!--输出实体[SYS_PSSYSUNIRES]外键关系 -->
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
     <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-33-12">
        <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"/>

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-76-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  ]]>
+         </createView>
+     </changeSet>
 
 </databaseChangeLog>

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

@@ -27,7 +27,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 `T_SYS_PSSYSUNIRES` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`SYS_PSSYSUNIRESID`, t1.`SYS_PSSYSUNIRESNAME`, t1.`UNIRESCODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZPSSYSUNIRES` t1  
 			]]>
     </sql>