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

app_web/src/widgets/meta-dynamic-model/dyna-inst-form/dyna-inst-form-model.ts

@@ -63,7 +63,7 @@ export default class DynaInstModel {
       {
         name: 'systemid',
         prop: 'system_id',
-        dataType: 'PICKUP',
+        dataType: 'TEXT',
       },
       {
         name: 'configid',

app_web/src/widgets/meta-dynamic-model/main-form/main-form-model.ts

@@ -63,7 +63,7 @@ export default class MainModel {
       {
         name: 'systemid',
         prop: 'system_id',
-        dataType: 'PICKUP',
+        dataType: 'TEXT',
       },
       {
         name: 'pdynainstid',

app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts

@@ -34,7 +34,7 @@ export default class MainModel {
         {
           name: 'systemid',
           prop: 'system_id',
-          dataType: 'PICKUP',
+          dataType: 'TEXT',
         },
         {
           name: 'status',

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

@@ -105,14 +105,6 @@ public class MetaDynamicModel extends EntityMP implements Serializable {
     @ApiModelProperty("状态")
     private String status;
 
-    /**
-     * 
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private cn.ibizlab.core.lite.domain.DstSystem system;
-
     /**
      * 主实例标识
      */

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDynamicModelMapper.java

@@ -63,8 +63,6 @@ public interface MetaDynamicModelMapper extends BaseMapper<MetaDynamicModel> {
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
 
-    List<MetaDynamicModel> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
-
     List<MetaDynamicModel> selectByPdynainstid(@Param("configid") Serializable configid);
 
 }

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

@@ -42,8 +42,6 @@ public interface IMetaDynamicModelService extends IService<MetaDynamicModel> {
     void saveBatch(List<MetaDynamicModel> list);
     Page<MetaDynamicModel> searchDefault(MetaDynamicModelSearchContext context);
     Page<MetaDynamicModel> searchDynaInst(MetaDynamicModelSearchContext context);
-    List<MetaDynamicModel> selectBySystemId(String pssystemid);
-    void removeBySystemId(String pssystemid);
     List<MetaDynamicModel> selectByPdynainstid(String configid);
     void removeByPdynainstid(String configid);
     /**

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

@@ -62,9 +62,6 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
     protected cn.ibizlab.core.lite.service.IDstViewService dstviewService;
     @Autowired
     @Lazy
-    protected cn.ibizlab.core.lite.service.IMetaDynamicModelService metadynamicmodelService;
-    @Autowired
-    @Lazy
     protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
     @Autowired
     @Lazy

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

@@ -50,9 +50,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
 
 
     protected cn.ibizlab.core.lite.service.IMetaDynamicModelService metadynamicmodelService = this;
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.core.lite.service.IDstSystemService dstsystemService;
 
     protected int batchSize = 500;
 
@@ -216,15 +213,6 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
     }
 
 
-	@Override
-    public List<MetaDynamicModel> selectBySystemId(String pssystemid) {
-        return baseMapper.selectBySystemId(pssystemid);
-    }
-    @Override
-    public void removeBySystemId(String pssystemid) {
-        this.remove(new QueryWrapper<MetaDynamicModel>().eq("systemid",pssystemid));
-    }
-
 	@Override
     public List<MetaDynamicModel> selectByPdynainstid(String configid) {
         return baseMapper.selectByPdynainstid(configid);

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

@@ -178,7 +178,7 @@
 
 
     <!--输出实体[DST_SYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-dst_system-46-9">
+    <changeSet author="a_A_5d9d78509" id="tab-dst_system-47-9">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
@@ -244,7 +244,7 @@
 
 
     <!--输出实体[META_DYNAMICMODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-150-12">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-153-12">
         <createTable tableName="IBZDYNAMICMODEL">
                 <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -448,7 +448,7 @@
         <!--输出实体[DST_VIEW]外键关系 -->
         <!--输出实体[META_DATASET]外键关系 -->
         <!--输出实体[META_DYNAMICMODEL]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-150-18">
+    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-153-18">
        <addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[META_ENTITY]外键关系 -->

ibzlite-core/src/main/resources/mapper/lite/metadynamicmodel/MetaDynamicModelMapper.xml

@@ -17,23 +17,13 @@
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
     <resultMap id="MetaDynamicModelResultMap" type="cn.ibizlab.core.lite.domain.MetaDynamicModel" autoMapping="true">
 		<id property="configid" column="configid" /><!--主键字段映射-->
-		<result property="systemId" column="systemid" />
 		<result property="pdynainstid" column="pdynainstid" />
             
 		
-		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
-		<association property="system" javaType="cn.ibizlab.core.lite.domain.DstSystem" column="systemid" select="cn.ibizlab.core.lite.mapper.DstSystemMapper.selectById" fetchType="lazy"></association>
 		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
 		<association property="pdynamicinstid" javaType="cn.ibizlab.core.lite.domain.MetaDynamicModel" column="pdynainstid" select="cn.ibizlab.core.lite.mapper.MetaDynamicModelMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
-	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID] -->
-	 <select id="selectBySystemId" resultMap="MetaDynamicModelResultMap">
-         select t1.* from (
-                <include refid="Default" />
-			 ) t1
-			 where  systemid=#{pssystemid}
-     </select>
 	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID] -->
 	 <select id="selectByPdynainstid" resultMap="MetaDynamicModelResultMap">
          select t1.* from (

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

@@ -1559,12 +1559,6 @@
      "entity_name":"DST_VIEW",
      "ref_entity_name":"DST_SYSTEM"
     },
-    {"name":"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID",
-     "relation_type":"DER1N",
-     "code_name":"System",
-     "entity_name":"META_DYNAMICMODEL",
-     "ref_entity_name":"DST_SYSTEM"
-    },
     {"name":"DER1N_META_ENTITY_DST_SYSTEM_SYSTEMID",
      "relation_type":"DER1N",
      "code_name":"System",
@@ -1928,11 +1922,7 @@
     "codename":"System_id",
     "field_logic_name":"系统",
     "entity_name":"META_DYNAMICMODEL",
-    "ref_de":"DST_SYSTEM",
-    "ref_field_name":"PSSYSTEMID",
-    "relation_name":"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID",
-    "relation_codename":"System",
-    "field_type":"PICKUP",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
@@ -2026,12 +2016,6 @@
     }
     ],
     "parentEntitys":[
-    {"name":"DER1N_META_DYNAMICMODEL_DST_SYSTEM_SYSTEMID",
-     "relation_type":"DER1N",
-     "code_name":"System",
-     "entity_name":"META_DYNAMICMODEL",
-     "ref_entity_name":"DST_SYSTEM"
-    },
     {"name":"DER1N_META_DYNAMICMODEL_META_DYNAMICMODEL_PDYNAINSTID",
      "relation_type":"DER1N",
      "code_name":"PDynamicInstId",