ibiz4j 发布系统代码 [ibz-lite，应用]

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzlite/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzlite/
-      mvn clean package -Pweb
-      cd ibzlite-app/ibzlite-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzlite-app/ibzlite-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar
 
-EXPOSE 30010
+EXPOSE 8080
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml

@@ -3,22 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

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

+package cn.ibizlab.core.lite.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+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;
+import cn.ibizlab.util.annotation.Audit;
+
+
+/**
+ * [lookup] 对象
+ */
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class MetaLookup extends EntityBase implements Serializable {
+
+    /**
+     * 标识
+     */
+    @DEField(isKeyField=true)
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    private String id;
+
+    /**
+     * 关系标识
+     */
+    @JSONField(name = "relationId")
+    @JsonProperty("relationId")
+    private String relationid;
+
+    /**
+     * 属性名称
+     */
+    @JSONField(name = "fieldName")
+    @JsonProperty("fieldName")
+    private String fieldname;
+
+    /**
+     * 引用属性名称
+     */
+    @JSONField(name = "refFieldName")
+    @JsonProperty("refFieldName")
+    private String reffieldname;
+
+
+    /**
+     * 
+     */
+    @JSONField(name = "relation")
+    @JsonProperty("relation")
+    private cn.ibizlab.core.lite.domain.MetaRelationship relation;
+
+
+
+}
+
+

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

@@ -139,13 +139,13 @@ public class MetaRelationship extends EntityMP implements Serializable {
      */
     @JSONField(name = "lookups")
     @JsonProperty("lookups")
-    @TableField(value = "lookup" , typeHandler = cn.ibizlab.core.lite.domain.handlers.DstLookupTypeHandler.class)
-    private List<cn.ibizlab.core.lite.domain.DstLookup> lookup;
+    @TableField(value = "lookup" , typeHandler = cn.ibizlab.core.lite.domain.handlers.MetaLookupTypeHandler.class)
+    private List<cn.ibizlab.core.lite.domain.MetaLookup> lookup;
 
     /**
      * 设置 [lookup]
      */
-    public void setLookup(List<cn.ibizlab.core.lite.domain.DstLookup> lookup) {
+    public void setLookup(List<cn.ibizlab.core.lite.domain.MetaLookup> lookup) {
         this.lookup = lookup ;
         this.modify("lookup",(lookup!=null)?lookup:(new ArrayList()));
     }

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

+package cn.ibizlab.core.lite.domain.handlers;
+
+import cn.ibizlab.core.lite.domain.MetaLookup;
+import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@MappedTypes({List.class})
+@MappedJdbcTypes(JdbcType.VARCHAR)
+public class MetaLookupTypeHandler extends AbstractJsonTypeHandler<List>
+{
+    private static ObjectMapper objectMapper = new ObjectMapper();
+    private JavaType type;
+
+    public MetaLookupTypeHandler(Class<List> type) {
+        this.type = objectMapper.getTypeFactory().constructParametricType(ArrayList.class, MetaLookup.class);
+    }
+
+    @Override
+    protected List parse(String json) {
+        try {
+            return objectMapper.readValue(json, type);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected String toJson(List obj) {
+        try {
+            return objectMapper.writeValueAsString(obj);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void setObjectMapper(ObjectMapper objectMapper) {
+        MetaLookupTypeHandler.objectMapper = objectMapper;
+    }
+}
+
+
+

ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaLookupSearchContext.java

+package cn.ibizlab.core.lite.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.util.filter.SearchContextBase;
+
+/**
+ * ServiceApi数据实体[MetaLookup] 查询条件对象
+ */
+@Slf4j
+@Data
+public class MetaLookupSearchContext extends SearchContextBase {
+	private String n_relationid_eq;//[关系标识]
+
+	private String n_relationid_like;//[关系标识]
+
+}
+
+

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaLookupService.java

+package cn.ibizlab.core.lite.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.core.lite.domain.MetaLookup;
+import cn.ibizlab.core.lite.filter.MetaLookupSearchContext;
+
+
+/**
+ * 实体[MetaLookup] 服务对象接口
+ */
+public interface IMetaLookupService{
+
+    boolean create(MetaLookup et) ;
+    void createBatch(List<MetaLookup> list) ;
+    boolean update(MetaLookup et) ;
+    void updateBatch(List<MetaLookup> list) ;
+    boolean remove(String key) ;
+    void removeBatch(Collection<String> idList) ;
+    MetaLookup get(String key) ;
+    MetaLookup getDraft(MetaLookup et) ;
+    boolean checkKey(MetaLookup et) ;
+    boolean save(MetaLookup et) ;
+    void saveBatch(List<MetaLookup> list) ;
+    Page<MetaLookup> searchDefault(MetaLookupSearchContext context) ;
+    List<MetaLookup> selectByRelationid(String id);
+    void removeByRelationid(String id);
+    void saveByRelationid(String id,List<MetaLookup> list) ;
+
+}
+
+
+

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaLookupServiceImpl.java

+package cn.ibizlab.core.lite.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import cn.ibizlab.util.errors.BadRequestAlertException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.core.lite.domain.MetaLookup;
+import cn.ibizlab.core.lite.filter.MetaLookupSearchContext;
+import cn.ibizlab.core.lite.service.IMetaLookupService;
+
+import cn.ibizlab.util.helper.CachedBeanCopier;
+import cn.ibizlab.util.helper.DEFieldCacheMap;
+
+
+/**
+ * 实体[lookup] 无存储服务对象接口实现
+ */
+@Slf4j
+@Service
+public class MetaLookupServiceImpl implements IMetaLookupService {
+
+
+    @Override
+    public boolean create(MetaLookup et) {
+        //代码实现
+        return true;
+    }
+
+    public void createBatch(List<MetaLookup> list){
+    }
+
+    @Override
+    public boolean update(MetaLookup et) {
+        //代码实现
+        return true;
+    }
+
+    public void updateBatch(List<MetaLookup> list){
+    }
+
+    @Override
+    public boolean remove(String key) {
+        return true;
+    }
+
+    public void removeBatch(Collection<String> idList){
+    }
+
+    @Override
+    public MetaLookup get(String key) {
+        MetaLookup et = new MetaLookup();
+        et.setId(key);
+        return et;
+    }
+
+    @Override
+    public MetaLookup getDraft(MetaLookup et) {
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(MetaLookup et) {
+        return false;
+    }
+    @Override
+    @Transactional
+    public boolean save(MetaLookup et) {
+        //代码实现
+        return true;
+    }
+
+    @Override
+    public void saveBatch(List<MetaLookup> list) {
+    }
+
+
+
+	@Override
+    public List<MetaLookup> selectByRelationid(String id) {
+        return null;
+    }
+
+    @Override
+    public void removeByRelationid(String id) {
+        Set<String> delIds=new HashSet<String>();
+        for(MetaLookup before:selectByRelationid(id)){
+            delIds.add(before.getId());
+        }
+        if(delIds.size()>0)
+            this.removeBatch(delIds);
+    }
+
+    @Autowired
+    @Lazy
+    IMetaLookupService proxyService;
+	@Override
+    public void saveByRelationid(String id,List<MetaLookup> list) {
+        if(list==null)
+            return;
+        Set<String> delIds=new HashSet<String>();
+        List<MetaLookup> _update=new ArrayList<MetaLookup>();
+        List<MetaLookup> _create=new ArrayList<MetaLookup>();
+        for(MetaLookup before:selectByRelationid(id)){
+            delIds.add(before.getId());
+        }
+        for(MetaLookup sub:list) {
+            sub.setRelationid(id);
+            if(ObjectUtils.isEmpty(sub.getId()))
+                sub.setId((String)sub.getDefaultKey(true));
+            if(delIds.contains(sub.getId())) {
+                delIds.remove(sub.getId());
+                _update.add(sub);
+            }
+            else
+                _create.add(sub);
+        }
+        if(_update.size()>0)
+            proxyService.updateBatch(_update);
+        if(_create.size()>0)
+            proxyService.createBatch(_create);
+        if(delIds.size()>0)
+            proxyService.removeBatch(delIds);
+	}
+
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<MetaLookup> searchDefault(MetaLookupSearchContext context) {
+        return new PageImpl<MetaLookup>(new ArrayList(),context.getPageable(),0);
+    }
+
+
+}
+
+

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[BLADE_VISUAL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual-47-1">
+    <changeSet author="root" id="tab-blade_visual-47-1">
         <createTable tableName="blade_visual">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-20-2">
+    <changeSet author="root" id="tab-blade_visual_category-20-2">
         <createTable tableName="blade_visual_category">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
@@ -52,7 +52,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
+    <changeSet author="root" id="tab-blade_visual_config-18-3">
         <createTable tableName="blade_visual_config">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
@@ -68,7 +68,7 @@
 
 
     <!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
+    <changeSet author="root" id="tab-blade_visual_map-18-4">
         <createTable tableName="blade_visual_map">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
@@ -86,7 +86,7 @@
 
 
     <!--输出实体[DST_COMPONENT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_component-56-5">
+    <changeSet author="root" id="tab-dst_component-56-5">
         <createTable tableName="IBZCOMPONENT">
                 <column name="CID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
@@ -110,7 +110,7 @@
 
 
     <!--输出实体[DST_CONFIG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
+    <changeSet author="root" id="tab-dst_config-32-6">
         <createTable tableName="IBZCFG">
                 <column name="CFGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
@@ -132,7 +132,7 @@
 
 
     <!--输出实体[DST_DATASOURCE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_datasource-39-7">
+    <changeSet author="root" id="tab-dst_datasource-39-7">
         <createTable tableName="IBZDATASOURCE">
                 <column name="DSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
@@ -149,10 +149,8 @@
 
 
 
-
-
     <!--输出实体[DST_ROUTER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_router-33-8">
+    <changeSet author="root" id="tab-dst_router-33-8">
         <createTable tableName="IBZROUTER">
                 <column name="ROUTERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
@@ -176,7 +174,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-37-9">
+    <changeSet author="root" id="tab-dst_system-37-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -196,7 +194,7 @@
 
 
     <!--输出实体[DST_VIEW]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_view-43-10">
+    <changeSet author="root" id="tab-dst_view-43-10">
         <createTable tableName="IBZVIEW">
                 <column name="VIEWID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
@@ -218,7 +216,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-32-11">
+    <changeSet author="root" id="tab-meta_dataset-32-11">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -240,7 +238,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-79-12">
+    <changeSet author="root" id="tab-meta_entity-79-12">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -262,7 +260,7 @@
 
 
     <!--输出实体[META_FIELD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_field-147-13">
+    <changeSet author="root" id="tab-meta_field-147-13">
         <createTable tableName="IBZFIELD">
                 <column name="FIELDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
@@ -319,8 +317,10 @@
     </changeSet>
 
 
+
+
     <!--输出实体[META_MODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_model-26-14">
+    <changeSet author="root" id="tab-meta_model-26-14">
         <createTable tableName="IBZMODEL">
                 <column name="MODELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
@@ -338,7 +338,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-86-15">
+    <changeSet author="root" id="tab-meta_relation-90-15">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>

ibzlite-core/src/main/resources/mapper/lite/metarelationship/MetaRelationshipMapper.xml

@@ -22,7 +22,7 @@
 		<result property="entityId" column="entityid" />
 		<result property="refEntityId" column="refentityid" />
             
-		<result property="lookup" column="lookup" typeHandler="cn.ibizlab.core.lite.domain.handlers.DstLookupTypeHandler" />
+		<result property="lookup" column="lookup" typeHandler="cn.ibizlab.core.lite.domain.handlers.MetaLookupTypeHandler" />
 		
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="entity" javaType="cn.ibizlab.core.lite.domain.MetaEntity" column="entityid" select="cn.ibizlab.core.lite.mapper.MetaEntityMapper.selectById" fetchType="lazy"></association>

ibzlite-core/src/main/resources/sysmodel/ibzlite.json

@@ -1075,87 +1075,6 @@
     ],
     "parentEntitys":[
     ]
- }
-    ,
-    {
-    "entity_name":"DST_LOOKUP",
-    "logic_name":"lookup",
-    "code_name":"DstLookup",
-    "table_name":"IBZLOOKUP",
-    "system_id":"ibzlite",
-    "system_name":"ibzlite",
-    "fields":[
-    {
-    "fieldname":"ID" ,
-    "codename":"Id",
-    "field_logic_name":"标识",
-    "entity_name":"DstLookup",
-    "field_type":"TEXT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":1,
-    "show_order":1,
-    "major_field":0
-    },
-    {
-    "fieldname":"RELATIONID" ,
-    "codename":"RelationId",
-    "field_logic_name":"关系标识",
-    "entity_name":"DstLookup",
-    "ref_de":"META_RELATION",
-    "ref_field_name":"RELATIONID",
-    "relation_name":"DER1N_DST_LOOKUP_META_RELATION_RELATIONID",
-    "relation_codename":"Relation",
-    "field_type":"PICKUP",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "show_order":2,
-    "major_field":1
-    },
-    {
-    "fieldname":"FIELDNAME" ,
-    "codename":"FieldName",
-    "field_logic_name":"属性名称",
-    "entity_name":"DstLookup",
-    "field_type":"TEXT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "show_order":3,
-    "major_field":0
-    },
-    {
-    "fieldname":"REFFIELDNAME" ,
-    "codename":"RefFieldName",
-    "field_logic_name":"引用属性名称",
-    "entity_name":"DstLookup",
-    "field_type":"TEXT",
-    "nullable":1,
-    "physical_field":1,
-    "data_type":"VARCHAR",
-    "data_length":100,
-    "key_field":0,
-    "show_order":4,
-    "major_field":0
-    }
-    ],
-    "subEntitys":[
-    ],
-    "parentEntitys":[
-    {"name":"DER1N_DST_LOOKUP_META_RELATION_RELATIONID",
-     "relation_type":"DER1N",
-     "code_name":"Relation",
-     "entity_name":"DST_LOOKUP",
-     "ref_entity_name":"META_RELATION"
-    }
-    ]
  }
     ,
     {
@@ -2589,6 +2508,87 @@
      "ref_entity_name":"META_RELATION"
     }
     ]
+ }
+    ,
+    {
+    "entity_name":"META_LOOKUP",
+    "logic_name":"lookup",
+    "code_name":"MetaLookup",
+    "table_name":"IBZLOOKUP",
+    "system_id":"ibzlite",
+    "system_name":"ibzlite",
+    "fields":[
+    {
+    "fieldname":"ID" ,
+    "codename":"Id",
+    "field_logic_name":"标识",
+    "entity_name":"MetaLookup",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":1,
+    "show_order":1,
+    "major_field":0
+    },
+    {
+    "fieldname":"RELATIONID" ,
+    "codename":"RelationId",
+    "field_logic_name":"关系标识",
+    "entity_name":"MetaLookup",
+    "ref_de":"META_RELATION",
+    "ref_field_name":"RELATIONID",
+    "relation_name":"DER1N_META_LOOKUP_META_RELATION_RELATIONID",
+    "relation_codename":"Relation",
+    "field_type":"PICKUP",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":2,
+    "major_field":1
+    },
+    {
+    "fieldname":"FIELDNAME" ,
+    "codename":"FieldName",
+    "field_logic_name":"属性名称",
+    "entity_name":"MetaLookup",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":3,
+    "major_field":0
+    },
+    {
+    "fieldname":"REFFIELDNAME" ,
+    "codename":"RefFieldName",
+    "field_logic_name":"引用属性名称",
+    "entity_name":"MetaLookup",
+    "field_type":"TEXT",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":100,
+    "key_field":0,
+    "show_order":4,
+    "major_field":0
+    }
+    ],
+    "subEntitys":[
+    ],
+    "parentEntitys":[
+    {"name":"DER1N_META_LOOKUP_META_RELATION_RELATIONID",
+     "relation_type":"DER1N",
+     "code_name":"Relation",
+     "entity_name":"META_LOOKUP",
+     "ref_entity_name":"META_RELATION"
+    }
+    ]
  }
     ,
     {
@@ -2932,16 +2932,16 @@
     }
     ],
     "subEntitys":[
-    {"name":"DER1N_DST_LOOKUP_META_RELATION_RELATIONID",
+    {"name":"DER1N_META_FIELD_META_RELATION_RELATIONID",
      "relation_type":"DER1N",
      "code_name":"Relation",
-     "entity_name":"DST_LOOKUP",
+     "entity_name":"META_FIELD",
      "ref_entity_name":"META_RELATION"
     },
-    {"name":"DER1N_META_FIELD_META_RELATION_RELATIONID",
+    {"name":"DER1N_META_LOOKUP_META_RELATION_RELATIONID",
      "relation_type":"DER1N",
      "code_name":"Relation",
-     "entity_name":"META_FIELD",
+     "entity_name":"META_LOOKUP",
      "ref_entity_name":"META_RELATION"
     }
     ],

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaLookupDTO.java

+package cn.ibizlab.api.dto;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.HashMap;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import cn.ibizlab.util.domain.DTOBase;
+import cn.ibizlab.util.domain.DTOClient;
+import lombok.Data;
+
+/**
+ * 服务DTO对象[MetaLookupDTO]
+ */
+@Data
+public class MetaLookupDTO extends DTOBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性 [ID]
+     *
+     */
+    @JSONField(name = "id")
+    @JsonProperty("id")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String id;
+
+    /**
+     * 属性 [RELATIONID]
+     *
+     */
+    @JSONField(name = "relationid")
+    @JsonProperty("relationid")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String relationid;
+
+    /**
+     * 属性 [FIELDNAME]
+     *
+     */
+    @JSONField(name = "fieldname")
+    @JsonProperty("fieldname")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String fieldname;
+
+    /**
+     * 属性 [REFFIELDNAME]
+     *
+     */
+    @JSONField(name = "reffieldname")
+    @JsonProperty("reffieldname")
+    @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    private String reffieldname;
+
+
+    /**
+     * 设置 [RELATIONID]
+     */
+    public void setRelationid(String  relationid){
+        this.relationid = relationid ;
+        this.modify("relationid",relationid);
+    }
+
+    /**
+     * 设置 [FIELDNAME]
+     */
+    public void setFieldname(String  fieldname){
+        this.fieldname = fieldname ;
+        this.modify("fieldname",fieldname);
+    }
+
+    /**
+     * 设置 [REFFIELDNAME]
+     */
+    public void setReffieldname(String  reffieldname){
+        this.reffieldname = reffieldname ;
+        this.modify("reffieldname",reffieldname);
+    }
+
+
+}
+
+

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaRelationshipDTO.java

@@ -187,11 +187,11 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
 
 
     /**
-     *  [DST_LOOKUP]
+     *  [META_LOOKUP]
      */
-    @JsonProperty("dstlookups")
-    @JSONField(name = "dstlookups")
-	private List<DstLookupDTO> lookup ;
+    @JsonProperty("metalookups")
+    @JSONField(name = "metalookups")
+	private List<MetaLookupDTO> lookup ;
 
 }
 

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaLookupMapping.java

+package cn.ibizlab.api.mapping;
+
+import org.mapstruct.*;
+import cn.ibizlab.core.lite.domain.MetaLookup;
+import cn.ibizlab.api.dto.MetaLookupDTO;
+import cn.ibizlab.util.domain.MappingBase;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaLookupMapping",
+    nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
+    nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
+public interface MetaLookupMapping extends MappingBase<MetaLookupDTO, MetaLookup> {
+
+
+}
+