Skip to content

I
ibzlite
提交 6676442d 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 961687b4
显示空白字符变更
内嵌 并排
正在显示 包含 308 行增加 和 231 行删除
app_web/src/locale/lanres/entities/blade-visual/blade-visual_en_US.ts
浏览文件 @ 6676442d
......@@ -3,15 +3,15 @@ export default {
fields: {
id: "主键",
title: "大屏标题",
backgroundurl: "大屏背景",
category: "大屏类型",
password: "发布密码",
createuser: "创建人",
createdept: "创建部门",
backgroundurl: "大屏背景",
status: "状态",
createtime: "创建时间",
updateuser: "修改人",
createdept: "创建部门",
createuser: "创建人",
updatetime: "修改时间",
status: "状态",
updateuser: "修改人",
isdeleted: "是否已删除",
},
views: {
......
app_web/src/locale/lanres/entities/blade-visual/blade-visual_zh_CN.ts
浏览文件 @ 6676442d
......@@ -2,15 +2,15 @@ export default {
fields: {
id: "主键",
title: "大屏标题",
backgroundurl: "大屏背景",
category: "大屏类型",
password: "发布密码",
createuser: "创建人",
createdept: "创建部门",
backgroundurl: "大屏背景",
status: "状态",
createtime: "创建时间",
updateuser: "修改人",
createdept: "创建部门",
createuser: "创建人",
updatetime: "修改时间",
status: "状态",
updateuser: "修改人",
isdeleted: "是否已删除",
},
views: {
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisual.java
浏览文件 @ 6676442d
......@@ -58,14 +58,6 @@ public class BladeVisual extends EntityMP implements Serializable {
@JSONField(name = "title")
@JsonProperty("title")
private String title;
/**
* 大屏背景
*/
@DEField(name = "background_url")
@TableField(value = "background_url")
@JSONField(name = "backgroundurl")
@JsonProperty("backgroundurl")
private String backgroundurl;
/**
* 大屏类型
*/
......@@ -81,21 +73,20 @@ public class BladeVisual extends EntityMP implements Serializable {
@JsonProperty("password")
private String password;
/**
* 创建人
* 大屏背景
*/
@DEField(name = "create_user")
@TableField(value = "create_user")
@JSONField(name = "createuser")
@JsonProperty("createuser")
private Long createuser;
@DEField(name = "background_url")
@TableField(value = "background_url")
@JSONField(name = "backgroundurl")
@JsonProperty("backgroundurl")
private String backgroundurl;
/**
* 创建部门
* 状态
*/
@DEField(name = "create_dept")
@TableField(value = "create_dept")
@JSONField(name = "createdept")
@JsonProperty("createdept")
private Long createdept;
@TableField(value = "status")
@JSONField(name = "status")
@JsonProperty("status")
private Integer status;
/**
* 创建时间
*/
......@@ -106,13 +97,21 @@ public class BladeVisual extends EntityMP implements Serializable {
@JsonProperty("createtime")
private Timestamp createtime;
/**
* 修改人
* 创建部门
*/
@DEField(name = "update_user")
@TableField(value = "update_user")
@JSONField(name = "updateuser")
@JsonProperty("updateuser")
private Long updateuser;
@DEField(name = "create_dept")
@TableField(value = "create_dept")
@JSONField(name = "createdept")
@JsonProperty("createdept")
private Long createdept;
/**
* 创建人
*/
@DEField(name = "create_user")
@TableField(value = "create_user")
@JSONField(name = "createuser")
@JsonProperty("createuser")
private Long createuser;
/**
* 修改时间
*/
......@@ -123,12 +122,13 @@ public class BladeVisual extends EntityMP implements Serializable {
@JsonProperty("updatetime")
private Timestamp updatetime;
/**
* 状态
* 修改人
*/
@TableField(value = "status")
@JSONField(name = "status")
@JsonProperty("status")
private Integer status;
@DEField(name = "update_user")
@TableField(value = "update_user")
@JSONField(name = "updateuser")
@JsonProperty("updateuser")
private Long updateuser;
/**
* 是否已删除
*/
......@@ -149,14 +149,6 @@ public class BladeVisual extends EntityMP implements Serializable {
this.modify("title",title);
}
/**
* 设置 [大屏背景]
*/
public void setBackgroundurl(String backgroundurl){
this.backgroundurl = backgroundurl ;
this.modify("background_url",backgroundurl);
}
/**
* 设置 [大屏类型]
*/
......@@ -174,11 +166,19 @@ public class BladeVisual extends EntityMP implements Serializable {
}
/**
* 设置 [创建人]
* 设置 [大屏背景]
*/
public void setCreateuser(Long createuser){
this.createuser = createuser ;
this.modify("create_user",createuser);
public void setBackgroundurl(String backgroundurl){
this.backgroundurl = backgroundurl ;
this.modify("background_url",backgroundurl);
}
/**
* 设置 [状态]
*/
public void setStatus(Integer status){
this.status = status ;
this.modify("status",status);
}
/**
......@@ -190,19 +190,19 @@ public class BladeVisual extends EntityMP implements Serializable {
}
/**
* 设置 [修改人]
* 设置 [创建人]
*/
public void setUpdateuser(Long updateuser){
this.updateuser = updateuser ;
this.modify("update_user",updateuser);
public void setCreateuser(Long createuser){
this.createuser = createuser ;
this.modify("create_user",createuser);
}
/**
* 设置 [状态]
* 设置 [修改人]
*/
public void setStatus(Integer status){
this.status = status ;
this.modify("status",status);
public void setUpdateuser(Long updateuser){
this.updateuser = updateuser ;
this.modify("update_user",updateuser);
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisualConfig.java
浏览文件 @ 6676442d
......@@ -59,13 +59,6 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
@JSONField(name = "visualid")
@JsonProperty("visualid")
private Long visualid;
/**
* 配置json
*/
@TableField(value = "detail")
@JSONField(name = "detail")
@JsonProperty("detail")
private String detail;
/**
* 组件json
*/
......@@ -73,6 +66,13 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
@JSONField(name = "component")
@JsonProperty("component")
private String component;
/**
* 配置json
*/
@TableField(value = "detail")
@JSONField(name = "detail")
@JsonProperty("detail")
private String detail;
......@@ -84,14 +84,6 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
this.modify("visual_id",visualid);
}
/**
* 设置 [配置json]
*/
public void setDetail(String detail){
this.detail = detail ;
this.modify("detail",detail);
}
/**
* 设置 [组件json]
*/
......@@ -100,6 +92,14 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
this.modify("component",component);
}
/**
* 设置 [配置json]
*/
public void setDetail(String detail){
this.detail = detail ;
this.modify("detail",detail);
}
@Override
public Serializable getDefaultKey(boolean gen) {
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaModelSearchContext.java
浏览文件 @ 6676442d
......@@ -34,6 +34,27 @@ public class MetaModelSearchContext extends QueryWrapperContext<MetaModel> {
this.getSearchCond().like("modelname", n_modelname_like);
}
}
private String n_codename_eq;//[代码名称]
public void setN_codename_eq(String n_codename_eq) {
this.n_codename_eq = n_codename_eq;
if(!ObjectUtils.isEmpty(this.n_codename_eq)){
this.getSearchCond().eq("codename", n_codename_eq);
}
}
private String n_codename_in;//[代码名称]
public void setN_codename_in(String n_codename_in) {
this.n_codename_in = n_codename_in;
if(!ObjectUtils.isEmpty(this.n_codename_in)){
this.getSearchCond().in("codename",this.n_codename_in.split(";"));
}
}
private String n_codename_like;//[代码名称]
public void setN_codename_like(String n_codename_like) {
this.n_codename_like = n_codename_like;
if(!ObjectUtils.isEmpty(this.n_codename_like)){
this.getSearchCond().like("codename", n_codename_like);
}
}
/**
* 启用快速搜索
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 6676442d
......@@ -4,30 +4,30 @@
<!--输出实体[BLADE_VISUAL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual-34-1">
<changeSet author="root" id="tab-blade_visual-46-1">
<createTable tableName="blade_visual">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
</column>
<column name="TITLE" remarks="" type="VARCHAR(255)">
</column>
<column name="BACKGROUND_URL" remarks="" type="TEXT(1048576)">
</column>
<column name="CATEGORY" remarks="" type="INT">
</column>
<column name="PASSWORD" remarks="" type="VARCHAR(255)">
</column>
<column name="CREATE_USER" remarks="" type="BIGINT">
<column name="BACKGROUND_URL" remarks="" type="TEXT(1048576)">
</column>
<column name="CREATE_DEPT" remarks="" type="BIGINT">
<column name="STATUS" remarks="" type="INT">
</column>
<column name="CREATE_TIME" remarks="" type="DATETIME">
</column>
<column name="UPDATE_USER" remarks="" type="BIGINT">
<column name="CREATE_DEPT" remarks="" type="BIGINT">
</column>
<column name="CREATE_USER" remarks="" type="BIGINT">
</column>
<column name="UPDATE_TIME" remarks="" type="DATETIME">
</column>
<column name="STATUS" remarks="" type="INT">
<column name="UPDATE_USER" remarks="" type="BIGINT">
</column>
<column name="IS_DELETED" remarks="" type="INT">
</column>
......@@ -36,7 +36,7 @@
<!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-15-2">
<changeSet author="root" id="tab-blade_visual_category-19-2">
<createTable tableName="blade_visual_category">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
......@@ -52,23 +52,23 @@
<!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-13-3">
<changeSet author="root" id="tab-blade_visual_config-17-3">
<createTable tableName="blade_visual_config">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
</column>
<column name="VISUAL_ID" remarks="" type="BIGINT">
</column>
<column name="DETAIL" remarks="" type="TEXT(1048576)">
</column>
<column name="COMPONENT" remarks="" type="TEXT(1048576)">
</column>
<column name="DETAIL" remarks="" type="TEXT(1048576)">
</column>
</createTable>
</changeSet>
<!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-14-4">
<changeSet author="root" id="tab-blade_visual_map-17-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-23-6">
<changeSet author="root" id="tab-dst_config-23-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"/>
......@@ -152,7 +152,7 @@
<!--输出实体[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 +176,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 +196,7 @@
<!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_view-42-10">
<changeSet author="root" id="tab-dst_view-42-10">
<createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
......@@ -218,7 +218,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 +240,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 +262,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"/>
......@@ -320,7 +320,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-23-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-86-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/avuedata/bladevisual/BladeVisualMapper.xml
浏览文件 @ 6676442d
......@@ -7,16 +7,19 @@
<select id="selectById" resultMap="BladeVisualResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`BACKGROUND_URL`, t1.`CATEGORY`, t1.`CREATE_DEPT`, t1.`CREATE_TIME`, t1.`CREATE_USER`, t1.`ID`, t1.`IS_DELETED`, t1.`PASSWORD`, t1.`STATUS`, t1.`TITLE`, t1.`UPDATE_TIME`, t1.`UPDATE_USER` FROM `blade_visual` t1 ) t1 where id=#{id}]]>
</select>
<select id="selectById" resultMap="BladeVisualResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.BACKGROUND_URL, t1.CATEGORY, t1.CREATE_DEPT, t1.CREATE_TIME, t1.CREATE_USER, t1.ID, t1.IS_DELETED, t1.PASSWORD, t1.STATUS, t1.TITLE, t1.UPDATE_TIME, t1.UPDATE_USER FROM blade_visual t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="BladeVisualResultMap" type="cn.ibizlab.core.avuedata.domain.BladeVisual" autoMapping="true">
<id property="id" column="id" /><!--主键字段映射-->
<result property="backgroundurl" column="background_url" />
<result property="createuser" column="create_user" />
<result property="createdept" column="create_dept" />
<result property="createtime" column="create_time" />
<result property="updateuser" column="update_user" />
<result property="createdept" column="create_dept" />
<result property="createuser" column="create_user" />
<result property="updatetime" column="update_time" />
<result property="updateuser" column="update_user" />
<result property="isdeleted" column="is_deleted" />
......@@ -38,11 +41,23 @@
WHERE t1.IS_DELETED = 0
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CATEGORY, t1.CREATE_DEPT, t1.CREATE_TIME, t1.CREATE_USER, t1.ID, t1.IS_DELETED, t1.PASSWORD, t1.STATUS, t1.TITLE, t1.UPDATE_TIME, t1.UPDATE_USER FROM blade_visual t1
WHERE t1.IS_DELETED = 0
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`BACKGROUND_URL`, t1.`CATEGORY`, t1.`CREATE_DEPT`, t1.`CREATE_TIME`, t1.`CREATE_USER`, t1.`ID`, t1.`IS_DELETED`, t1.`PASSWORD`, t1.`STATUS`, t1.`TITLE`, t1.`UPDATE_TIME`, t1.`UPDATE_USER` FROM `blade_visual` t1
WHERE t1.IS_DELETED = 0
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.BACKGROUND_URL, t1.CATEGORY, t1.CREATE_DEPT, t1.CREATE_TIME, t1.CREATE_USER, t1.ID, t1.IS_DELETED, t1.PASSWORD, t1.STATUS, t1.TITLE, t1.UPDATE_TIME, t1.UPDATE_USER FROM blade_visual t1
WHERE t1.IS_DELETED = 0
]]>
</sql>
</mapper>
ibzlite-core/src/main/resources/mapper/avuedata/bladevisualcategory/BladeVisualCategoryMapper.xml
浏览文件 @ 6676442d
......@@ -7,6 +7,9 @@
<select id="selectById" resultMap="BladeVisualCategoryResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CATEGORY_KEY`, t1.`CATEGORY_VALUE`, t1.`ID`, t1.`IS_DELETED` FROM `blade_visual_category` t1 ) t1 where id=#{id}]]>
</select>
<select id="selectById" resultMap="BladeVisualCategoryResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CATEGORY_KEY, t1.CATEGORY_VALUE, t1.ID, t1.IS_DELETED FROM blade_visual_category t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="BladeVisualCategoryResultMap" type="cn.ibizlab.core.avuedata.domain.BladeVisualCategory" autoMapping="true">
......@@ -34,11 +37,23 @@
WHERE t1.IS_DELETED = 1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CATEGORY_KEY, t1.CATEGORY_VALUE, t1.ID, t1.IS_DELETED FROM blade_visual_category t1
WHERE t1.IS_DELETED = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CATEGORY_KEY`, t1.`CATEGORY_VALUE`, t1.`ID`, t1.`IS_DELETED` FROM `blade_visual_category` t1
WHERE t1.IS_DELETED = 1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CATEGORY_KEY, t1.CATEGORY_VALUE, t1.ID, t1.IS_DELETED FROM blade_visual_category t1
WHERE t1.IS_DELETED = 1
]]>
</sql>
</mapper>
ibzlite-core/src/main/resources/mapper/avuedata/bladevisualconfig/BladeVisualConfigMapper.xml
浏览文件 @ 6676442d
......@@ -7,6 +7,9 @@
<select id="selectById" resultMap="BladeVisualConfigResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`COMPONENT`, t1.`DETAIL`, t1.`ID`, t1.`VISUAL_ID` FROM `blade_visual_config` t1 ) t1 where id=#{id}]]>
</select>
<select id="selectById" resultMap="BladeVisualConfigResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.COMPONENT, t1.DETAIL, t1.ID, t1.VISUAL_ID FROM blade_visual_config t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="BladeVisualConfigResultMap" type="cn.ibizlab.core.avuedata.domain.BladeVisualConfig" autoMapping="true">
......@@ -31,10 +34,20 @@
<![CDATA[ SELECT t1.`ID`, t1.`VISUAL_ID` FROM `blade_visual_config` t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ID, t1.VISUAL_ID FROM blade_visual_config t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`COMPONENT`, t1.`DETAIL`, t1.`ID`, t1.`VISUAL_ID` FROM `blade_visual_config` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.COMPONENT, t1.DETAIL, t1.ID, t1.VISUAL_ID FROM blade_visual_config t1
]]>
</sql>
</mapper>
ibzlite-core/src/main/resources/mapper/avuedata/bladevisualmap/BladeVisualMapMapper.xml
浏览文件 @ 6676442d
......@@ -7,6 +7,9 @@
<select id="selectById" resultMap="BladeVisualMapResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`DATA`, t1.`ID`, t1.`NAME` FROM `blade_visual_map` t1 ) t1 where id=#{id}]]>
</select>
<select id="selectById" resultMap="BladeVisualMapResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.DATA, t1.ID, t1.NAME FROM blade_visual_map t1 ) t1 where id=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="BladeVisualMapResultMap" type="cn.ibizlab.core.avuedata.domain.BladeVisualMap" autoMapping="true">
......@@ -30,10 +33,20 @@
<![CDATA[ SELECT t1.`ID`, t1.`NAME` FROM `blade_visual_map` t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.ID, t1.NAME FROM blade_visual_map t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`DATA`, t1.`ID`, t1.`NAME` FROM `blade_visual_map` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.DATA, t1.ID, t1.NAME FROM blade_visual_map t1
]]>
</sql>
</mapper>
ibzlite-core/src/main/resources/mapper/lite/metafield/MetaFieldMapper.xml
浏览文件 @ 6676442d
......@@ -11,7 +11,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="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}]]>
<![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>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -73,7 +73,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![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]-->
......@@ -88,7 +88,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![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>
</mapper>
......
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @ 6676442d
......@@ -21,7 +21,7 @@
"data_type":"BIGINT",
"data_length":100,
"key_field":1,
"show_order":1000,
"show_order":1,
"major_field":0
},
{
......@@ -35,24 +35,10 @@
"data_type":"VARCHAR",
"data_length":255,
"key_field":0,
"show_order":1000,
"show_order":2,
"major_field":1
},
{
"fieldname":"BACKGROUND_URL" ,
"codename":"BackgroundUrl",
"field_logic_name":"大屏背景",
"entity_name":"BladeVisual",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"major_field":0
},
{
"fieldname":"CATEGORY" ,
"codename":"Category",
"field_logic_name":"大屏类型",
......@@ -62,7 +48,7 @@
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"show_order":3,
"major_field":0
},
{
......@@ -76,35 +62,34 @@
"data_type":"VARCHAR",
"data_length":255,
"key_field":0,
"show_order":1000,
"show_order":4,
"major_field":0
},
{
"fieldname":"CREATE_USER" ,
"codename":"CreateUser",
"field_logic_name":"创建人",
"fieldname":"BACKGROUND_URL" ,
"codename":"BackgroundUrl",
"field_logic_name":"大屏背景",
"entity_name":"BladeVisual",
"field_type":"BIGINT",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":100,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"show_order":5,
"major_field":0
},
{
"fieldname":"CREATE_DEPT" ,
"codename":"CreateDept",
"field_logic_name":"创建部门",
"fieldname":"STATUS" ,
"codename":"Status",
"field_logic_name":"状态",
"entity_name":"BladeVisual",
"field_type":"BIGINT",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":100,
"data_type":"INT",
"key_field":0,
"show_order":1000,
"show_order":6,
"major_field":0
},
{
......@@ -118,21 +103,35 @@
"data_type":"DATETIME",
"predefined":"CREATEDATE",
"key_field":0,
"show_order":1000,
"show_order":11,
"major_field":0
},
{
"fieldname":"UPDATE_USER" ,
"codename":"UpdateUser",
"field_logic_name":"修改人",
"fieldname":"CREATE_DEPT" ,
"codename":"CreateDept",
"field_logic_name":"创建部门",
"entity_name":"BladeVisual",
"field_type":"BIGINT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":20,
"data_length":100,
"key_field":0,
"show_order":1000,
"show_order":12,
"major_field":0
},
{
"fieldname":"CREATE_USER" ,
"codename":"CreateUser",
"field_logic_name":"创建人",
"entity_name":"BladeVisual",
"field_type":"BIGINT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":100,
"key_field":0,
"show_order":13,
"major_field":0
},
{
......@@ -146,20 +145,21 @@
"data_type":"DATETIME",
"predefined":"UPDATEDATE",
"key_field":0,
"show_order":1000,
"show_order":14,
"major_field":0
},
{
"fieldname":"STATUS" ,
"codename":"Status",
"field_logic_name":"状态",
"fieldname":"UPDATE_USER" ,
"codename":"UpdateUser",
"field_logic_name":"修改人",
"entity_name":"BladeVisual",
"field_type":"INT",
"field_type":"BIGINT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"data_type":"BIGINT",
"data_length":20,
"key_field":0,
"show_order":1000,
"show_order":15,
"major_field":0
},
{
......@@ -173,7 +173,7 @@
"data_type":"INT",
"predefined":"LOGICVALID",
"key_field":0,
"show_order":1000,
"show_order":16,
"major_field":0
}
],
......@@ -202,7 +202,7 @@
"data_type":"BIGINT",
"data_length":20,
"key_field":1,
"show_order":1000,
"show_order":1,
"major_field":0
},
{
......@@ -216,7 +216,7 @@
"data_type":"VARCHAR",
"data_length":12,
"key_field":0,
"show_order":1000,
"show_order":2,
"major_field":0
},
{
......@@ -230,7 +230,7 @@
"data_type":"VARCHAR",
"data_length":64,
"key_field":0,
"show_order":1000,
"show_order":3,
"major_field":1
},
{
......@@ -244,7 +244,7 @@
"data_type":"INT",
"predefined":"LOGICVALID",
"key_field":0,
"show_order":1000,
"show_order":4,
"major_field":0
}
],
......@@ -273,7 +273,7 @@
"data_type":"BIGINT",
"data_length":20,
"key_field":1,
"show_order":1000,
"show_order":1,
"major_field":0
},
{
......@@ -287,13 +287,13 @@
"data_type":"BIGINT",
"data_length":20,
"key_field":0,
"show_order":1000,
"show_order":2,
"major_field":0
},
{
"fieldname":"DETAIL" ,
"codename":"Detail",
"field_logic_name":"配置json",
"fieldname":"COMPONENT" ,
"codename":"Component",
"field_logic_name":"组件json",
"entity_name":"BladeVisualConfig",
"field_type":"LONGTEXT",
"nullable":1,
......@@ -301,13 +301,13 @@
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"show_order":3,
"major_field":0
},
{
"fieldname":"COMPONENT" ,
"codename":"Component",
"field_logic_name":"组件json",
"fieldname":"DETAIL" ,
"codename":"Detail",
"field_logic_name":"配置json",
"entity_name":"BladeVisualConfig",
"field_type":"LONGTEXT",
"nullable":1,
......@@ -315,7 +315,7 @@
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"show_order":4,
"major_field":0
}
],
......@@ -344,7 +344,7 @@
"data_type":"BIGINT",
"data_length":20,
"key_field":1,
"show_order":1000,
"show_order":1,
"major_field":0
},
{
......@@ -358,7 +358,7 @@
"data_type":"VARCHAR",
"data_length":255,
"key_field":0,
"show_order":1000,
"show_order":2,
"major_field":1
},
{
......@@ -372,7 +372,7 @@
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":1000,
"show_order":3,
"major_field":0
}
],
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/BladeVisualConfigDTO.java
浏览文件 @ 6676442d
......@@ -48,22 +48,22 @@ public class BladeVisualConfigDTO extends DTOBase implements Serializable {
private Long visualid;
/**
* 属性 [DETAIL]
* 属性 [COMPONENT]
*
*/
@JSONField(name = "detail")
@JsonProperty("detail")
@JSONField(name = "component")
@JsonProperty("component")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String detail;
private String component;
/**
* 属性 [COMPONENT]
* 属性 [DETAIL]
*
*/
@JSONField(name = "component")
@JsonProperty("component")
@JSONField(name = "detail")
@JsonProperty("detail")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String component;
private String detail;
/**
......@@ -74,14 +74,6 @@ public class BladeVisualConfigDTO extends DTOBase implements Serializable {
this.modify("visual_id",visualid);
}
/**
* 设置 [DETAIL]
*/
public void setDetail(String detail){
this.detail = detail ;
this.modify("detail",detail);
}
/**
* 设置 [COMPONENT]
*/
......@@ -90,6 +82,14 @@ public class BladeVisualConfigDTO extends DTOBase implements Serializable {
this.modify("component",component);
}
/**
* 设置 [DETAIL]
*/
public void setDetail(String detail){
this.detail = detail ;
this.modify("detail",detail);
}
}
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/BladeVisualDTO.java
浏览文件 @ 6676442d
......@@ -47,15 +47,6 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
private String title;
/**
* 属性 [BACKGROUND_URL]
*
*/
@JSONField(name = "backgroundurl")
@JsonProperty("backgroundurl")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String backgroundurl;
/**
* 属性 [CATEGORY]
*
......@@ -74,22 +65,21 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
private String password;
/**
* 属性 [CREATE_USER]
* 属性 [BACKGROUND_URL]
*
*/
@JSONField(name = "createuser")
@JsonProperty("createuser")
@JsonSerialize(using = ToStringSerializer.class)
private Long createuser;
@JSONField(name = "backgroundurl")
@JsonProperty("backgroundurl")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String backgroundurl;
/**
* 属性 [CREATE_DEPT]
* 属性 [STATUS]
*
*/
@JSONField(name = "createdept")
@JsonProperty("createdept")
@JsonSerialize(using = ToStringSerializer.class)
private Long createdept;
@JSONField(name = "status")
@JsonProperty("status")
private Integer status;
/**
* 属性 [CREATE_TIME]
......@@ -101,13 +91,22 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
private Timestamp createtime;
/**
* 属性 [UPDATE_USER]
* 属性 [CREATE_DEPT]
*
*/
@JSONField(name = "updateuser")
@JsonProperty("updateuser")
@JSONField(name = "createdept")
@JsonProperty("createdept")
@JsonSerialize(using = ToStringSerializer.class)
private Long updateuser;
private Long createdept;
/**
* 属性 [CREATE_USER]
*
*/
@JSONField(name = "createuser")
@JsonProperty("createuser")
@JsonSerialize(using = ToStringSerializer.class)
private Long createuser;
/**
* 属性 [UPDATE_TIME]
......@@ -119,12 +118,13 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
private Timestamp updatetime;
/**
* 属性 [STATUS]
* 属性 [UPDATE_USER]
*
*/
@JSONField(name = "status")
@JsonProperty("status")
private Integer status;
@JSONField(name = "updateuser")
@JsonProperty("updateuser")
@JsonSerialize(using = ToStringSerializer.class)
private Long updateuser;
/**
* 属性 [IS_DELETED]
......@@ -143,14 +143,6 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
this.modify("title",title);
}
/**
* 设置 [BACKGROUND_URL]
*/
public void setBackgroundurl(String backgroundurl){
this.backgroundurl = backgroundurl ;
this.modify("background_url",backgroundurl);
}
/**
* 设置 [CATEGORY]
*/
......@@ -168,11 +160,19 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
}
/**
* 设置 [CREATE_USER]
* 设置 [BACKGROUND_URL]
*/
public void setCreateuser(Long createuser){
this.createuser = createuser ;
this.modify("create_user",createuser);
public void setBackgroundurl(String backgroundurl){
this.backgroundurl = backgroundurl ;
this.modify("background_url",backgroundurl);
}
/**
* 设置 [STATUS]
*/
public void setStatus(Integer status){
this.status = status ;
this.modify("status",status);
}
/**
......@@ -184,19 +184,19 @@ public class BladeVisualDTO extends DTOBase implements Serializable {
}
/**
* 设置 [UPDATE_USER]
* 设置 [CREATE_USER]
*/
public void setUpdateuser(Long updateuser){
this.updateuser = updateuser ;
this.modify("update_user",updateuser);
public void setCreateuser(Long createuser){
this.createuser = createuser ;
this.modify("create_user",createuser);
}
/**
* 设置 [STATUS]
* 设置 [UPDATE_USER]
*/
public void setStatus(Integer status){
this.status = status ;
this.modify("status",status);
public void setUpdateuser(Long updateuser){
this.updateuser = updateuser ;
this.modify("update_user",updateuser);
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或