Skip to content

I
ibzlite
提交 2712786a 编写于 作者: llz's avatar llz
浏览文件
操作

Merge branch 'master' of http://demo.ibizlab.cn/ibiz4jteam/ibzlite into master

上级 204d0106 ac21d8a0
显示空白字符变更
内嵌 并排
正在显示 包含 95 行增加 和 25 行删除
app_web/src/widgets/meta-model/main-form/main-form-base.vue
浏览文件 @ 2712786a
......@@ -34,10 +34,8 @@
</i-col>
<i-col v-show="detailsModel.modelcfg.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='modelcfg' :itemRules="this.rules().modelcfg" class='' :caption="$t('entities.metamodel.main_form.details.modelcfg')" uiStyle="DEFAULT" :labelWidth="0" :isShowCaption="false" :error="detailsModel.modelcfg.error" :isEmptyCaption="false" labelPos="NONE">
<input-box v-model="data.modelcfg" :textareaId="this.$util.createUUID()" :disabled="detailsModel.modelcfg.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
<app-form-json v-model="data.modelcfg" :formState="formState" :data="data" :disabled="detailsModel.modelcfg.disabled"></app-form-json>
</app-form-item>
</i-col>
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstAPI.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstApp.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstComponent.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstConfig.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstDataSource.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstLookup.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstMicroservice.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstRouter.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstView.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaDataSet.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaField.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaModel.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaModule.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaRelationship.java
浏览文件 @ 2712786a
......@@ -19,6 +19,7 @@ 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;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstComponentServiceImpl.java
浏览文件 @ 2712786a
......@@ -254,6 +254,7 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstConfigServiceImpl.java
浏览文件 @ 2712786a
......@@ -203,6 +203,7 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
浏览文件 @ 2712786a
......@@ -194,6 +194,7 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstRouterServiceImpl.java
浏览文件 @ 2712786a
......@@ -223,6 +223,7 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
浏览文件 @ 2712786a
......@@ -213,6 +213,7 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstViewServiceImpl.java
浏览文件 @ 2712786a
......@@ -247,6 +247,7 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java
浏览文件 @ 2712786a
......@@ -258,6 +258,7 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
浏览文件 @ 2712786a
......@@ -279,6 +279,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
浏览文件 @ 2712786a
......@@ -305,6 +305,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
浏览文件 @ 2712786a
......@@ -198,6 +198,7 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java
浏览文件 @ 2712786a
......@@ -310,6 +310,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
}
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 2712786a
......@@ -8,7 +8,7 @@
<!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_component-56-1">
<changeSet author="root" id="tab-dst_component-56-1">
<createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
......@@ -32,7 +32,7 @@
<!--输出实体[DST_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_config-23-2">
<changeSet author="root" id="tab-dst_config-23-2">
<createTable tableName="IBZCFG">
<column name="CFGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
......@@ -54,7 +54,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-39-3">
<changeSet author="root" id="tab-dst_datasource-39-3">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -74,7 +74,7 @@
<!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_router-33-4">
<changeSet author="root" id="tab-dst_router-33-4">
<createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
......@@ -98,7 +98,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-37-5">
<changeSet author="root" id="tab-dst_system-37-5">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -118,7 +118,7 @@
<!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_view-42-6">
<changeSet author="root" id="tab-dst_view-42-6">
<createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
......@@ -140,7 +140,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-32-7">
<changeSet author="root" id="tab-meta_dataset-32-7">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -162,7 +162,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-79-8">
<changeSet author="root" id="tab-meta_entity-79-8">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -184,7 +184,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-147-9">
<changeSet author="root" id="tab-meta_field-147-9">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -242,7 +242,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-22-10">
<changeSet author="root" id="tab-meta_model-23-10">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -260,7 +260,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-86-11">
<changeSet author="root" id="tab-meta_relation-86-11">
<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/metafield/MetaFieldMapper.xml
浏览文件 @ 2712786a
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY` FROM `IBZFIELD` t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaFieldResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaFieldResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
......@@ -68,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
<![CDATA[ SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -83,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
<![CDATA[ SELECT t1.CODENAME, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
]]>
</sql>
<!--数据查询[View]-->
......
ibzlite-dependencies/pom.xml
浏览文件 @ 2712786a
......@@ -233,12 +233,6 @@
<version>${jsonwebtoken-jjwt.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${alibaba-druid.version}</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
......@@ -351,6 +345,8 @@
</dependency>
</dependencies>
</project>
ibzlite-util/src/main/java/cn/ibizlab/util/annotation/DEField.java
浏览文件 @ 2712786a
......@@ -2,6 +2,7 @@ package cn.ibizlab.util.annotation;
import cn.ibizlab.util.enums.DEFieldDefaultValueType;
import cn.ibizlab.util.enums.DEPredefinedFieldType;
import cn.ibizlab.util.enums.DupCheck;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
......@@ -66,5 +67,14 @@ public @interface DEField
* @return
*/
String format() default "";
/**
* 重复性检查
* @return
*/
DupCheck dupCheck() default DupCheck.NONE;
/**
* 范围属性
*/
String dupCheckField() default "";
}
ibzlite-util/src/main/java/cn/ibizlab/util/enums/DupCheck.java 0 → 100644
浏览文件 @ 2712786a
package cn.ibizlab.util.enums;
/**
* 属性重复值检查
*/
public enum DupCheck {
/**
* 不检查
*/
NONE,
/**
* 全部检查
*/
ALL,
/**
* 非空检查
*/
NOTNULL,
/**
* 指定范围检查
*/
RANGE,
}
ibzlite-util/src/main/java/cn/ibizlab/util/errors/ExceptionTranslator.java
浏览文件 @ 2712786a
package cn.ibizlab.util.errors;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.dao.*;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
......@@ -90,9 +90,18 @@ public class ExceptionTranslator implements ProblemHandling {
return create(ex, problem, request);
}
@ExceptionHandler(DataAccessException.class)
public ResponseEntity<Problem> handlerDataAccessFailure(DataAccessException ex, NativeWebRequest request){
Problem problem = Problem.builder()
.withStatus(Status.INTERNAL_SERVER_ERROR)
.with("message", ex.getMessage())
.build();
return create(ex, problem, request,createFailureAlert(ex.getClass().getSimpleName(), ex.getClass().getSimpleName(), ex.getMessage()));
}
public static HttpHeaders createFailureAlert(String entityName, String errorKey, String defaultMessage) {
HttpHeaders headers = new HttpHeaders();
headers.add("X-ibz-error", "error." + errorKey);
headers.add("X-ibz-error", errorKey);
headers.add("X-ibz-params", entityName);
return headers;
}
......
ibzlite-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @ 2712786a
......@@ -59,6 +59,7 @@ public class AppController {
appData.put("enablepermissionvalid",false);
else
appData.put("enablepermissionvalid",enablePermissionValid);
fillAppData(appData);
return ResponseEntity.status(HttpStatus.OK).body(appData);
}
......@@ -87,4 +88,12 @@ public class AppController {
throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",configType);
return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
}
/**
* 应用参数扩展
* @param appData
*/
protected void fillAppData(JSONObject appData){
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或