结构更新

ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaEntity.java

@@ -18,6 +18,8 @@ import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
+import cn.ibizlab.util.helper.DataObject;
+import cn.ibizlab.util.enums.DupCheck;
 import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
@@ -36,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @Setter
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
-@TableName(value = "IBZENTITY",resultMap = "MetaEntityResultMap")
+@TableName(value = "IBZENTITY", resultMap = "MetaEntityResultMap")
 public class MetaEntity extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -44,8 +46,8 @@ public class MetaEntity extends EntityMP implements Serializable {
     /**
      * 标识
      */
-    @DEField(isKeyField=true)
-    @TableId(value= "entityid",type=IdType.ASSIGN_UUID)
+    @DEField(isKeyField = true)
+    @TableId(value = "entityid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "entity_id")
     @JsonProperty("entity_id")
     private String entityId;
@@ -105,9 +107,37 @@ public class MetaEntity extends EntityMP implements Serializable {
     @JSONField(name = "ds_name")
     @JsonProperty("ds_name")
     private String dsName;
+    /**
+     * 模块标识
+     */
+    @TableField(value = "moduleid")
+    @JSONField(name = "module_id")
+    @JsonProperty("module_id")
+    private String moduleId;
+    /**
+     * 模块
+     */
+    @TableField(exist = false)
+    @JSONField(name = "module_name")
+    @JsonProperty("module_name")
+    private String moduleName;
+    /**
+     * 扩展参数
+     */
+    @TableField(value = "extparams")
+    @JSONField(name = "ext_params")
+    @JsonProperty("ext_params")
+    private String extParams;
+    /**
+     * 排序
+     */
+    @TableField(value = "showorder")
+    @JSONField(name = "show_order")
+    @JsonProperty("show_order")
+    private Integer showOrder;
 
     /**
-     * 
+     *
      */
     @JsonIgnore
     @JSONField(serialize = false)
@@ -115,13 +145,21 @@ public class MetaEntity extends EntityMP implements Serializable {
     private cn.ibizlab.core.lite.domain.DstDataSource dataSource;
 
     /**
-     * 
+     *
      */
     @JsonIgnore
     @JSONField(serialize = false)
     @TableField(exist = false)
     private cn.ibizlab.core.lite.domain.DstSystem system;
 
+    /**
+     * 模型
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private cn.ibizlab.core.lite.domain.MetaModule module;
+
 
     /**
      * 数据集
@@ -158,57 +196,81 @@ public class MetaEntity extends EntityMP implements Serializable {
     /**
      * 设置 [实体名]
      */
-    public void setEntityName(String entityName){
-        this.entityName = entityName ;
-        this.modify("entityname",entityName);
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+        this.modify("entityname", entityName);
     }
 
     /**
      * 设置 [逻辑名称]
      */
-    public void setLogicName(String logicName){
-        this.logicName = logicName ;
-        this.modify("logicname",logicName);
+    public void setLogicName(String logicName) {
+        this.logicName = logicName;
+        this.modify("logicname", logicName);
     }
 
     /**
      * 设置 [代码名称]
      */
-    public void setCodeName(String codeName){
-        this.codeName = codeName ;
-        this.modify("codename",codeName);
+    public void setCodeName(String codeName) {
+        this.codeName = codeName;
+        this.modify("codename", codeName);
     }
 
     /**
      * 设置 [表名称]
      */
-    public void setTableName(String tableName){
-        this.tableName = tableName ;
-        this.modify("tablename",tableName);
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+        this.modify("tablename", tableName);
     }
 
     /**
      * 设置 [系统标识]
      */
-    public void setSystemId(String systemId){
-        this.systemId = systemId ;
-        this.modify("systemid",systemId);
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+        this.modify("systemid", systemId);
     }
 
     /**
      * 设置 [数据源标识]
      */
-    public void setDsId(String dsId){
-        this.dsId = dsId ;
-        this.modify("dsid",dsId);
+    public void setDsId(String dsId) {
+        this.dsId = dsId;
+        this.modify("dsid", dsId);
+    }
+
+    /**
+     * 设置 [模块标识]
+     */
+    public void setModuleId(String moduleId) {
+        this.moduleId = moduleId;
+        this.modify("moduleid", moduleId);
+    }
+
+    /**
+     * 设置 [扩展参数]
+     */
+    public void setExtParams(String extParams) {
+        this.extParams = extParams;
+        this.modify("extparams", extParams);
+    }
+
+    /**
+     * 设置 [排序]
+     */
+    public void setShowOrder(Integer showOrder) {
+        this.showOrder = showOrder;
+        this.modify("showorder", showOrder);
     }
 
 
     /**
      * 获取 [标识]
      */
-    public String getEntityId(){
-        if(ObjectUtils.isEmpty(entityId)){
+    public String getEntityId() {
+        if(ObjectUtils.isEmpty(entityId)) {
             entityId=(String)getDefaultKey(true);
         }
         return entityId;
@@ -230,7 +292,7 @@ public class MetaEntity extends EntityMP implements Serializable {
     @Override
     public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
         this.reset("entityid");
-        return super.copyTo(targetEntity,bIncEmpty);
+        return super.copyTo(targetEntity, bIncEmpty);
     }
 }
 

ibzlite-core/src/main/resources/liquibase/changelog/20201113080245_changelog.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:pro="http://www.liquibase.org/xml/ns/pro" 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/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+    <changeSet author="mac (generated)" id="1605254576612-1">
+        <preConditions onFail="MARK_RAN"  >
+            <not>
+                <tableExists tableName="IBZMODULE" />
+            </not>
+        </preConditions>
+        <createTable tableName="IBZMODULE">
+            <column name="MODULEID" type="VARCHAR(100)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
+            </column>
+            <column name="MODULENAME" type="VARCHAR(100)"/>
+            <column name="CODENAME" type="VARCHAR(100)"/>
+            <column name="SYSTEMID" type="VARCHAR(100)"/>
+            <column name="SHOWORDER" type="INT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="mac (generated)" id="1605254576612-2">
+        <preConditions onFail="MARK_RAN"  >
+            <not>
+                <columnExists tableName="IBZENTITY" columnName="MODULEID" />
+            </not>
+        </preConditions>
+        <addColumn tableName="IBZENTITY">
+            <column name="MODULEID" type="VARCHAR(100 BYTE)"/>
+        </addColumn>
+        <addColumn tableName="IBZENTITY">
+            <column name="EXTPARAMS" type="CLOB(2147483647)"/>
+        </addColumn>
+        <addColumn tableName="IBZENTITY">
+            <column name="SHOWORDER" type="INTEGER"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>