Skip to content

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

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

上级 bb701eff
显示空白字符变更
内嵌 并排
正在显示 包含 1872 行增加 和 1255 行删除
app_web/src/locale/lanres/entities/dst-microservice/dst-microservice_en_US.ts
浏览文件 @ 739701e4
......@@ -4,7 +4,7 @@ export default {
id: "标识",
label: "名称",
servicename: "服务名",
pssystemid: "系统标识",
systemid: "系统标识",
addr: "地址",
},
views: {
......
app_web/src/locale/lanres/entities/dst-microservice/dst-microservice_zh_CN.ts
浏览文件 @ 739701e4
......@@ -3,7 +3,7 @@ export default {
id: "标识",
label: "名称",
servicename: "服务名",
pssystemid: "系统标识",
systemid: "系统标识",
addr: "地址",
},
views: {
......
app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US.ts
浏览文件 @ 739701e4
......@@ -10,6 +10,10 @@ export default {
system_name: "系统",
ds_id: "数据源标识",
ds_name: "数据源",
module_id: "模块标识",
module_name: "模块",
ext_params: "扩展参数",
show_order: "排序",
},
views: {
pickupview: {
......
app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN.ts
浏览文件 @ 739701e4
......@@ -9,6 +9,10 @@ export default {
system_name: "系统",
ds_id: "数据源标识",
ds_name: "数据源",
module_id: "模块标识",
module_name: "模块",
ext_params: "扩展参数",
show_order: "排序",
},
views: {
pickupview: {
......
app_web/src/locale/lanres/entities/meta-module/meta-module_en_US.ts
浏览文件 @ 739701e4
......@@ -3,8 +3,9 @@ export default {
fields: {
id: "模块标识",
name: "模块名称",
codename: "代码名称",
systemid: "系统标识",
code_name: "代码名称",
system_id: "系统标识",
show_order: "排序",
},
views: {
pickupgridview: {
......
app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN.ts
浏览文件 @ 739701e4
......@@ -2,8 +2,9 @@ export default {
fields: {
id: "模块标识",
name: "模块名称",
codename: "代码名称",
systemid: "系统标识",
code_name: "代码名称",
system_id: "系统标识",
show_order: "排序",
},
views: {
pickupgridview: {
......
app_web/src/widgets/dst-microservice/default-searchform/default-searchform-model.ts
浏览文件 @ 739701e4
......@@ -37,7 +37,7 @@ export default class DefaultModel {
},
{
name: 'n_systemid_eq',
prop: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
},
]
......
app_web/src/widgets/dst-microservice/main-form/main-form-model.ts
浏览文件 @ 739701e4
......@@ -72,7 +72,7 @@ export default class MainModel {
},
{
name: 'systemid',
prop: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
},
{
......
app_web/src/widgets/dst-microservice/main-grid/main-grid-model.ts
浏览文件 @ 739701e4
......@@ -28,7 +28,7 @@ export default class MainModel {
return [
{
name: 'systemid',
prop: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
isEditable:true
},
......
app_web/src/widgets/dst-microservice/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 739701e4
......@@ -25,7 +25,7 @@ export default class PickupViewpickupviewpanelModel {
name: 'servicename',
},
{
name: 'pssystemid',
name: 'systemid',
},
{
name: 'addr',
......
app_web/src/widgets/meta-entity/main-grid/main-grid-model.ts
浏览文件 @ 739701e4
......@@ -51,6 +51,11 @@ export default class MainModel {
prop: 'logic_name',
dataType: 'TEXT',
},
{
name: 'moduleid',
prop: 'module_id',
dataType: 'PICKUP',
},
{
name: 'entityname',
prop: 'entity_name',
......
app_web/src/widgets/meta-entity/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 739701e4
......@@ -42,6 +42,18 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'ds_name',
},
{
name: 'module_id',
},
{
name: 'module_name',
},
{
name: 'ext_params',
},
{
name: 'show_order',
},
]
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisual.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "blade_visual",resultMap = "BladeVisualResultMap")
@TableName(value = "blade_visual", resultMap = "BladeVisualResultMap")
public class BladeVisual extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class BladeVisual extends EntityMP implements Serializable {
* 主键
*/
@DEField(isKeyField = true)
@TableId(value= "id",type=IdType.ASSIGN_ID)
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JSONField(name = "id")
@JsonProperty("id")
private Long id;
......@@ -92,7 +92,7 @@ public class BladeVisual extends EntityMP implements Serializable {
*/
@DEField(name = "create_time", preType = DEPredefinedFieldType.CREATEDATE)
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "createtime", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("createtime")
private Timestamp createtime;
......@@ -117,7 +117,7 @@ public class BladeVisual extends EntityMP implements Serializable {
*/
@DEField(name = "update_time", preType = DEPredefinedFieldType.UPDATEDATE)
@TableField(value = "update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "updatetime", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatetime")
private Timestamp updatetime;
......@@ -133,7 +133,7 @@ public class BladeVisual extends EntityMP implements Serializable {
* 是否已删除
*/
@DEField(name = "is_deleted", preType = DEPredefinedFieldType.LOGICVALID, logicval = "0", logicdelval = "1")
@TableLogic(value= "0", delval = "1")
@TableLogic(value = "0", delval = "1")
@TableField(value = "is_deleted")
@JSONField(name = "isdeleted")
@JsonProperty("isdeleted")
......@@ -145,64 +145,64 @@ public class BladeVisual extends EntityMP implements Serializable {
* 设置 [大屏标题]
*/
public void setTitle(String title) {
this.title = title ;
this.modify("title",title);
this.title = title;
this.modify("title", title);
}
/**
* 设置 [大屏类型]
*/
public void setCategory(Integer category) {
this.category = category ;
this.modify("category",category);
this.category = category;
this.modify("category", category);
}
/**
* 设置 [发布密码]
*/
public void setPassword(String password) {
this.password = password ;
this.modify("password",password);
this.password = password;
this.modify("password", password);
}
/**
* 设置 [大屏背景]
*/
public void setBackgroundurl(String backgroundurl) {
this.backgroundurl = backgroundurl ;
this.modify("background_url",backgroundurl);
this.backgroundurl = backgroundurl;
this.modify("background_url", backgroundurl);
}
/**
* 设置 [状态]
*/
public void setStatus(Integer status) {
this.status = status ;
this.modify("status",status);
this.status = status;
this.modify("status", status);
}
/**
* 设置 [创建部门]
*/
public void setCreatedept(Long createdept) {
this.createdept = createdept ;
this.modify("create_dept",createdept);
this.createdept = createdept;
this.modify("create_dept", createdept);
}
/**
* 设置 [创建人]
*/
public void setCreateuser(Long createuser) {
this.createuser = createuser ;
this.modify("create_user",createuser);
this.createuser = createuser;
this.modify("create_user", createuser);
}
/**
* 设置 [修改人]
*/
public void setUpdateuser(Long updateuser) {
this.updateuser = updateuser ;
this.modify("update_user",updateuser);
this.updateuser = updateuser;
this.modify("update_user", updateuser);
}
......@@ -220,7 +220,7 @@ public class BladeVisual extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("id");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisualCategory.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "blade_visual_category",resultMap = "BladeVisualCategoryResultMap")
@TableName(value = "blade_visual_category", resultMap = "BladeVisualCategoryResultMap")
public class BladeVisualCategory extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class BladeVisualCategory extends EntityMP implements Serializable {
* 主键
*/
@DEField(isKeyField = true)
@TableId(value= "id",type=IdType.ASSIGN_ID)
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JSONField(name = "id")
@JsonProperty("id")
private Long id;
......@@ -71,7 +71,7 @@ public class BladeVisualCategory extends EntityMP implements Serializable {
* 是否已删除
*/
@DEField(name = "is_deleted", preType = DEPredefinedFieldType.LOGICVALID, logicval = "1", logicdelval = "0")
@TableLogic(value= "1", delval = "0")
@TableLogic(value = "1", delval = "0")
@TableField(value = "is_deleted")
@JSONField(name = "isdeleted")
@JsonProperty("isdeleted")
......@@ -83,16 +83,16 @@ public class BladeVisualCategory extends EntityMP implements Serializable {
* 设置 [分类键值]
*/
public void setCategorykey(String categorykey) {
this.categorykey = categorykey ;
this.modify("category_key",categorykey);
this.categorykey = categorykey;
this.modify("category_key", categorykey);
}
/**
* 设置 [分类名称]
*/
public void setCategoryvalue(String categoryvalue) {
this.categoryvalue = categoryvalue ;
this.modify("category_value",categoryvalue);
this.categoryvalue = categoryvalue;
this.modify("category_value", categoryvalue);
}
......@@ -110,7 +110,7 @@ public class BladeVisualCategory extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("id");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisualConfig.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "blade_visual_config",resultMap = "BladeVisualConfigResultMap")
@TableName(value = "blade_visual_config", resultMap = "BladeVisualConfigResultMap")
public class BladeVisualConfig extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
* 主键
*/
@DEField(isKeyField = true)
@TableId(value= "id",type=IdType.ASSIGN_ID)
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JSONField(name = "id")
@JsonProperty("id")
private Long id;
......@@ -80,24 +80,24 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
* 设置 [可视化表主键]
*/
public void setVisualid(Long visualid) {
this.visualid = visualid ;
this.modify("visual_id",visualid);
this.visualid = visualid;
this.modify("visual_id", visualid);
}
/**
* 设置 [组件json]
*/
public void setComponent(String component) {
this.component = component ;
this.modify("component",component);
this.component = component;
this.modify("component", component);
}
/**
* 设置 [配置json]
*/
public void setDetail(String detail) {
this.detail = detail ;
this.modify("detail",detail);
this.detail = detail;
this.modify("detail", detail);
}
......@@ -115,7 +115,7 @@ public class BladeVisualConfig extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("id");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/domain/BladeVisualMap.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "blade_visual_map",resultMap = "BladeVisualMapResultMap")
@TableName(value = "blade_visual_map", resultMap = "BladeVisualMapResultMap")
public class BladeVisualMap extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class BladeVisualMap extends EntityMP implements Serializable {
* 主键
*/
@DEField(isKeyField = true)
@TableId(value= "id",type=IdType.ASSIGN_ID)
@TableId(value = "id", type = IdType.ASSIGN_ID)
@JSONField(name = "id")
@JsonProperty("id")
private Long id;
......@@ -72,16 +72,16 @@ public class BladeVisualMap extends EntityMP implements Serializable {
* 设置 [地图名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("name",name);
this.name = name;
this.modify("name", name);
}
/**
* 设置 [地图数据]
*/
public void setData(String data) {
this.data = data ;
this.modify("data",data);
this.data = data;
this.modify("data", data);
}
......@@ -99,7 +99,7 @@ public class BladeVisualMap extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("id");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualCategoryMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface BladeVisualCategoryMapper extends BaseMapper<BladeVisualCategory>{
public interface BladeVisualCategoryMapper extends BaseMapper<BladeVisualCategory> {
Page<BladeVisualCategory> searchDefault(IPage page, @Param("srf") BladeVisualCategorySearchContext context, @Param("ew") Wrapper<BladeVisualCategory> wrapper) ;
Page<BladeVisualCategory> searchDefault(IPage page, @Param("srf") BladeVisualCategorySearchContext context, @Param("ew") Wrapper<BladeVisualCategory> wrapper);
@Override
BladeVisualCategory selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualConfigMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface BladeVisualConfigMapper extends BaseMapper<BladeVisualConfig>{
public interface BladeVisualConfigMapper extends BaseMapper<BladeVisualConfig> {
Page<BladeVisualConfig> searchDefault(IPage page, @Param("srf") BladeVisualConfigSearchContext context, @Param("ew") Wrapper<BladeVisualConfig> wrapper) ;
Page<BladeVisualConfig> searchDefault(IPage page, @Param("srf") BladeVisualConfigSearchContext context, @Param("ew") Wrapper<BladeVisualConfig> wrapper);
@Override
BladeVisualConfig selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualMapMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface BladeVisualMapMapper extends BaseMapper<BladeVisualMap>{
public interface BladeVisualMapMapper extends BaseMapper<BladeVisualMap> {
Page<BladeVisualMap> searchDefault(IPage page, @Param("srf") BladeVisualMapSearchContext context, @Param("ew") Wrapper<BladeVisualMap> wrapper) ;
Page<BladeVisualMap> searchDefault(IPage page, @Param("srf") BladeVisualMapSearchContext context, @Param("ew") Wrapper<BladeVisualMap> wrapper);
@Override
BladeVisualMap selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface BladeVisualMapper extends BaseMapper<BladeVisual>{
public interface BladeVisualMapper extends BaseMapper<BladeVisual> {
Page<BladeVisual> searchDefault(IPage page, @Param("srf") BladeVisualSearchContext context, @Param("ew") Wrapper<BladeVisual> wrapper) ;
Page<BladeVisual> searchDefault(IPage page, @Param("srf") BladeVisualSearchContext context, @Param("ew") Wrapper<BladeVisual> wrapper);
@Override
BladeVisual selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/IBladeVisualCategoryService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[BladeVisualCategory] 服务对象接口
*/
public interface IBladeVisualCategoryService extends IService<BladeVisualCategory>{
boolean create(BladeVisualCategory et) ;
void createBatch(List<BladeVisualCategory> list) ;
boolean update(BladeVisualCategory et) ;
void updateBatch(List<BladeVisualCategory> list) ;
boolean remove(Long key) ;
void removeBatch(Collection<Long> idList) ;
BladeVisualCategory get(Long key) ;
BladeVisualCategory getDraft(BladeVisualCategory et) ;
boolean checkKey(BladeVisualCategory et) ;
boolean save(BladeVisualCategory et) ;
void saveBatch(List<BladeVisualCategory> list) ;
Page<BladeVisualCategory> searchDefault(BladeVisualCategorySearchContext context) ;
public interface IBladeVisualCategoryService extends IService<BladeVisualCategory> {
boolean create(BladeVisualCategory et);
void createBatch(List<BladeVisualCategory> list);
boolean update(BladeVisualCategory et);
void updateBatch(List<BladeVisualCategory> list);
boolean remove(Long key);
void removeBatch(Collection<Long> idList);
BladeVisualCategory get(Long key);
BladeVisualCategory getDraft(BladeVisualCategory et);
boolean checkKey(BladeVisualCategory et);
boolean save(BladeVisualCategory et);
void saveBatch(List<BladeVisualCategory> list);
Page<BladeVisualCategory> searchDefault(BladeVisualCategorySearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/IBladeVisualConfigService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[BladeVisualConfig] 服务对象接口
*/
public interface IBladeVisualConfigService extends IService<BladeVisualConfig>{
boolean create(BladeVisualConfig et) ;
void createBatch(List<BladeVisualConfig> list) ;
boolean update(BladeVisualConfig et) ;
void updateBatch(List<BladeVisualConfig> list) ;
boolean remove(Long key) ;
void removeBatch(Collection<Long> idList) ;
BladeVisualConfig get(Long key) ;
BladeVisualConfig getDraft(BladeVisualConfig et) ;
boolean checkKey(BladeVisualConfig et) ;
boolean save(BladeVisualConfig et) ;
void saveBatch(List<BladeVisualConfig> list) ;
Page<BladeVisualConfig> searchDefault(BladeVisualConfigSearchContext context) ;
public interface IBladeVisualConfigService extends IService<BladeVisualConfig> {
boolean create(BladeVisualConfig et);
void createBatch(List<BladeVisualConfig> list);
boolean update(BladeVisualConfig et);
void updateBatch(List<BladeVisualConfig> list);
boolean remove(Long key);
void removeBatch(Collection<Long> idList);
BladeVisualConfig get(Long key);
BladeVisualConfig getDraft(BladeVisualConfig et);
boolean checkKey(BladeVisualConfig et);
boolean save(BladeVisualConfig et);
void saveBatch(List<BladeVisualConfig> list);
Page<BladeVisualConfig> searchDefault(BladeVisualConfigSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/IBladeVisualMapService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[BladeVisualMap] 服务对象接口
*/
public interface IBladeVisualMapService extends IService<BladeVisualMap>{
boolean create(BladeVisualMap et) ;
void createBatch(List<BladeVisualMap> list) ;
boolean update(BladeVisualMap et) ;
void updateBatch(List<BladeVisualMap> list) ;
boolean remove(Long key) ;
void removeBatch(Collection<Long> idList) ;
BladeVisualMap get(Long key) ;
BladeVisualMap getDraft(BladeVisualMap et) ;
boolean checkKey(BladeVisualMap et) ;
boolean save(BladeVisualMap et) ;
void saveBatch(List<BladeVisualMap> list) ;
Page<BladeVisualMap> searchDefault(BladeVisualMapSearchContext context) ;
public interface IBladeVisualMapService extends IService<BladeVisualMap> {
boolean create(BladeVisualMap et);
void createBatch(List<BladeVisualMap> list);
boolean update(BladeVisualMap et);
void updateBatch(List<BladeVisualMap> list);
boolean remove(Long key);
void removeBatch(Collection<Long> idList);
BladeVisualMap get(Long key);
BladeVisualMap getDraft(BladeVisualMap et);
boolean checkKey(BladeVisualMap et);
boolean save(BladeVisualMap et);
void saveBatch(List<BladeVisualMap> list);
Page<BladeVisualMap> searchDefault(BladeVisualMapSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/IBladeVisualService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[BladeVisual] 服务对象接口
*/
public interface IBladeVisualService extends IService<BladeVisual>{
boolean create(BladeVisual et) ;
void createBatch(List<BladeVisual> list) ;
boolean update(BladeVisual et) ;
void updateBatch(List<BladeVisual> list) ;
boolean remove(Long key) ;
void removeBatch(Collection<Long> idList) ;
BladeVisual get(Long key) ;
BladeVisual getDraft(BladeVisual et) ;
boolean checkKey(BladeVisual et) ;
boolean save(BladeVisual et) ;
void saveBatch(List<BladeVisual> list) ;
Page<BladeVisual> searchDefault(BladeVisualSearchContext context) ;
public interface IBladeVisualService extends IService<BladeVisual> {
boolean create(BladeVisual et);
void createBatch(List<BladeVisual> list);
boolean update(BladeVisual et);
void updateBatch(List<BladeVisual> list);
boolean remove(Long key);
void removeBatch(Collection<Long> idList);
BladeVisual get(Long key);
BladeVisual getDraft(BladeVisual et);
boolean checkKey(BladeVisual et);
boolean save(BladeVisual et);
void saveBatch(List<BladeVisual> list);
Page<BladeVisual> searchDefault(BladeVisualSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualCategoryServiceImpl.java
浏览文件 @ 739701e4
......@@ -57,36 +57,36 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<BladeVisualCategory> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(BladeVisualCategory et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("id", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<BladeVisualCategory> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(Long key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -100,11 +100,11 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg
@Transactional
public BladeVisualCategory get(Long key) {
BladeVisualCategory et = getById(key);
if(et==null){
et=new BladeVisualCategory();
if(et == null){
et = new BladeVisualCategory();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -116,7 +116,7 @@ public class BladeVisualCategoryServiceImpl extends ServiceImpl<BladeVisualCateg
@Override
public boolean checkKey(BladeVisualCategory et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualConfigServiceImpl.java
浏览文件 @ 739701e4
......@@ -57,36 +57,36 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<BladeVisualConfig> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(BladeVisualConfig et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("id", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<BladeVisualConfig> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(Long key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -100,11 +100,11 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM
@Transactional
public BladeVisualConfig get(Long key) {
BladeVisualConfig et = getById(key);
if(et==null){
et=new BladeVisualConfig();
if(et == null){
et = new BladeVisualConfig();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -116,7 +116,7 @@ public class BladeVisualConfigServiceImpl extends ServiceImpl<BladeVisualConfigM
@Override
public boolean checkKey(BladeVisualConfig et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualMapServiceImpl.java
浏览文件 @ 739701e4
......@@ -57,36 +57,36 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper,
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<BladeVisualMap> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(BladeVisualMap et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("id", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<BladeVisualMap> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(Long key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -100,11 +100,11 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper,
@Transactional
public BladeVisualMap get(Long key) {
BladeVisualMap et = getById(key);
if(et==null){
et=new BladeVisualMap();
if(et == null){
et = new BladeVisualMap();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -116,7 +116,7 @@ public class BladeVisualMapServiceImpl extends ServiceImpl<BladeVisualMapMapper,
@Override
public boolean checkKey(BladeVisualMap et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/service/impl/BladeVisualServiceImpl.java
浏览文件 @ 739701e4
......@@ -57,36 +57,36 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<BladeVisual> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(BladeVisual et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("id",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("id", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<BladeVisual> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(Long key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -100,11 +100,11 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
@Transactional
public BladeVisual get(Long key) {
BladeVisual et = getById(key);
if(et==null){
et=new BladeVisual();
if(et == null){
et = new BladeVisual();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -116,7 +116,7 @@ public class BladeVisualServiceImpl extends ServiceImpl<BladeVisualMapper, Blade
@Override
public boolean checkKey(BladeVisual et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstAPI.java
浏览文件 @ 739701e4
......@@ -39,7 +39,7 @@ public class DstAPI extends EntityBase implements Serializable {
/**
* 标识
*/
@DEField(name = "apiid" , isKeyField=true)
@DEField(name = "apiid", isKeyField = true)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstApp.java
浏览文件 @ 739701e4
......@@ -39,7 +39,7 @@ public class DstApp extends EntityBase implements Serializable {
/**
* 应用标识
*/
@DEField(name = "appid" , isKeyField=true)
@DEField(name = "appid", isKeyField = true)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstComponent.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZCOMPONENT",resultMap = "DstComponentResultMap")
@TableName(value = "IBZCOMPONENT", resultMap = "DstComponentResultMap")
public class DstComponent extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class DstComponent extends EntityMP implements Serializable {
/**
* 部件标识
*/
@DEField(name = "cid" , isKeyField = true)
@TableId(value= "cid",type=IdType.ASSIGN_UUID)
@DEField(name = "cid", isKeyField = true)
@TableId(value = "cid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -141,56 +141,56 @@ public class DstComponent extends EntityMP implements Serializable {
* 设置 [名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("cname",name);
this.name = name;
this.modify("cname", name);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName ;
this.modify("codename",codeName);
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [系统标识]
*/
public void setSystemId(String systemId) {
this.systemId = systemId ;
this.modify("systemid",systemId);
this.systemId = systemId;
this.modify("systemid", systemId);
}
/**
* 设置 [应用标识]
*/
public void setAppId(String appId) {
this.appId = appId ;
this.modify("appid",appId);
this.appId = appId;
this.modify("appid", appId);
}
/**
* 设置 [类型]
*/
public void setType(String type) {
this.type = type ;
this.modify("ctype",type);
this.type = type;
this.modify("ctype", type);
}
/**
* 设置 [实体标识]
*/
public void setEntityId(String entityId) {
this.entityId = entityId ;
this.modify("entityid",entityId);
this.entityId = entityId;
this.modify("entityid", entityId);
}
/**
* 设置 [配置]
*/
public void setConfig(String config) {
this.config = config ;
this.modify("cfg",config);
this.config = config;
this.modify("cfg", config);
}
......@@ -198,7 +198,7 @@ public class DstComponent extends EntityMP implements Serializable {
* 获取 [部件标识]
*/
public String getId() {
if(ObjectUtils.isEmpty(id)){
if(ObjectUtils.isEmpty(id)) {
id=(String)getDefaultKey(true);
}
return id;
......@@ -220,7 +220,7 @@ public class DstComponent extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("cid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstConfig.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZCFG",resultMap = "DstConfigResultMap")
@TableName(value = "IBZCFG", resultMap = "DstConfigResultMap")
public class DstConfig extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class DstConfig extends EntityMP implements Serializable {
* 标识
*/
@DEField(isKeyField = true)
@TableId(value= "cfgid",type=IdType.ASSIGN_UUID)
@TableId(value = "cfgid", type = IdType.ASSIGN_UUID)
@JSONField(name = "cfg_id")
@JsonProperty("cfg_id")
private String cfgId;
......@@ -92,7 +92,7 @@ public class DstConfig extends EntityMP implements Serializable {
*/
@DEField(preType = DEPredefinedFieldType.UPDATEDATE)
@TableField(value = "updatedate")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "update_date", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("update_date")
private Timestamp updateDate;
......@@ -111,32 +111,32 @@ public class DstConfig extends EntityMP implements Serializable {
* 设置 [系统标识]
*/
public void setSystemId(String systemId) {
this.systemId = systemId ;
this.modify("systemid",systemId);
this.systemId = systemId;
this.modify("systemid", systemId);
}
/**
* 设置 [配置类型]
*/
public void setCfgType(String cfgType) {
this.cfgType = cfgType ;
this.modify("cfgtype",cfgType);
this.cfgType = cfgType;
this.modify("cfgtype", cfgType);
}
/**
* 设置 [引用类型]
*/
public void setTargetType(String targetType) {
this.targetType = targetType ;
this.modify("targettype",targetType);
this.targetType = targetType;
this.modify("targettype", targetType);
}
/**
* 设置 [配置内容]
*/
public void setCfg(String cfg) {
this.cfg = cfg ;
this.modify("cfg",cfg);
this.cfg = cfg;
this.modify("cfg", cfg);
}
......@@ -144,7 +144,7 @@ public class DstConfig extends EntityMP implements Serializable {
* 获取 [标识]
*/
public String getCfgId() {
if(ObjectUtils.isEmpty(cfgId)){
if(ObjectUtils.isEmpty(cfgId)) {
cfgId=(String)getDefaultKey(true);
}
return cfgId;
......@@ -166,7 +166,7 @@ public class DstConfig extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("cfgid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstDataSource.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZDATASOURCE",resultMap = "DstDataSourceResultMap")
@TableName(value = "IBZDATASOURCE", resultMap = "DstDataSourceResultMap")
public class DstDataSource extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class DstDataSource extends EntityMP implements Serializable {
/**
* 标识
*/
@DEField(defaultValue = "dsname" , defaultValueType = DEFieldDefaultValueType.PARAM , isKeyField = true)
@TableId(value= "dsid",type=IdType.ASSIGN_UUID)
@DEField(defaultValue = "dsname", defaultValueType = DEFieldDefaultValueType.PARAM, isKeyField = true)
@TableId(value = "dsid", type = IdType.ASSIGN_UUID)
@JSONField(name = "ds_id")
@JsonProperty("ds_id")
private String dsId;
......@@ -79,24 +79,24 @@ public class DstDataSource extends EntityMP implements Serializable {
* 设置 [数据源名称]
*/
public void setDsName(String dsName) {
this.dsName = dsName ;
this.modify("dsname",dsName);
this.dsName = dsName;
this.modify("dsname", dsName);
}
/**
* 设置 [类型]
*/
public void setDsType(String dsType) {
this.dsType = dsType ;
this.modify("dstype",dsType);
this.dsType = dsType;
this.modify("dstype", dsType);
}
/**
* 设置 [配置]
*/
public void setDsCfg(String dsCfg) {
this.dsCfg = dsCfg ;
this.modify("dscfg",dsCfg);
this.dsCfg = dsCfg;
this.modify("dscfg", dsCfg);
}
......@@ -110,7 +110,7 @@ public class DstDataSource extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("dsid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstMicroservice.java
浏览文件 @ 739701e4
......@@ -39,7 +39,7 @@ public class DstMicroservice extends EntityBase implements Serializable {
/**
* 标识
*/
@DEField(name = "msid" , isKeyField=true)
@DEField(name = "msid", isKeyField = true)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -62,10 +62,9 @@ public class DstMicroservice extends EntityBase implements Serializable {
/**
* 系统标识
*/
@DEField(name = "systemid")
@JSONField(name = "pSSystemId")
@JsonProperty("pSSystemId")
private String pssystemid;
@JSONField(name = "systemId")
@JsonProperty("systemId")
private String systemid;
/**
* 地址
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstRouter.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZROUTER",resultMap = "DstRouterResultMap")
@TableName(value = "IBZROUTER", resultMap = "DstRouterResultMap")
public class DstRouter extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class DstRouter extends EntityMP implements Serializable {
/**
* 路径标识
*/
@DEField(name = "routerid" , isKeyField = true)
@TableId(value= "routerid",type=IdType.ASSIGN_UUID)
@DEField(name = "routerid", isKeyField = true)
@TableId(value = "routerid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -133,56 +133,56 @@ public class DstRouter extends EntityMP implements Serializable {
* 设置 [路径名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("routername",name);
this.name = name;
this.modify("routername", name);
}
/**
* 设置 [系统标识]
*/
public void setSystemId(String systemId) {
this.systemId = systemId ;
this.modify("systemid",systemId);
this.systemId = systemId;
this.modify("systemid", systemId);
}
/**
* 设置 [应用标识]
*/
public void setAppId(String appId) {
this.appId = appId ;
this.modify("appid",appId);
this.appId = appId;
this.modify("appid", appId);
}
/**
* 设置 [路径]
*/
public void setPath(String path) {
this.path = path ;
this.modify("routerpath",path);
this.path = path;
this.modify("routerpath", path);
}
/**
* 设置 [父路径标识]
*/
public void setParentid(String parentid) {
this.parentid = parentid ;
this.modify("parentid",parentid);
this.parentid = parentid;
this.modify("parentid", parentid);
}
/**
* 设置 [meta]
*/
public void setMeta(String meta) {
this.meta = meta ;
this.modify("meta",meta);
this.meta = meta;
this.modify("meta", meta);
}
/**
* 设置 [组件]
*/
public void setComponent(String component) {
this.component = component ;
this.modify("component",component);
this.component = component;
this.modify("component", component);
}
......@@ -190,7 +190,7 @@ public class DstRouter extends EntityMP implements Serializable {
* 获取 [路径标识]
*/
public String getId() {
if(ObjectUtils.isEmpty(id)){
if(ObjectUtils.isEmpty(id)) {
id=(String)getDefaultKey(true);
}
return id;
......@@ -212,7 +212,7 @@ public class DstRouter extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("routerid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/DstView.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZVIEW",resultMap = "DstViewResultMap")
@TableName(value = "IBZVIEW", resultMap = "DstViewResultMap")
public class DstView extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class DstView extends EntityMP implements Serializable {
/**
* 标识
*/
@DEField(name = "viewid" , isKeyField = true)
@TableId(value= "viewid",type=IdType.ASSIGN_UUID)
@DEField(name = "viewid", isKeyField = true)
@TableId(value = "viewid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -134,48 +134,48 @@ public class DstView extends EntityMP implements Serializable {
* 设置 [名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("viewname",name);
this.name = name;
this.modify("viewname", name);
}
/**
* 设置 [视图路径]
*/
public void setPath(String path) {
this.path = path ;
this.modify("viewpath",path);
this.path = path;
this.modify("viewpath", path);
}
/**
* 设置 [系统标识]
*/
public void setSystemId(String systemId) {
this.systemId = systemId ;
this.modify("systemid",systemId);
this.systemId = systemId;
this.modify("systemid", systemId);
}
/**
* 设置 [应用标识]
*/
public void setAppId(String appId) {
this.appId = appId ;
this.modify("appid",appId);
this.appId = appId;
this.modify("appid", appId);
}
/**
* 设置 [实体标识]
*/
public void setEntityId(String entityId) {
this.entityId = entityId ;
this.modify("entityid",entityId);
this.entityId = entityId;
this.modify("entityid", entityId);
}
/**
* 设置 [配置]
*/
public void setConfig(String config) {
this.config = config ;
this.modify("cfg",config);
this.config = config;
this.modify("cfg", config);
}
......@@ -183,7 +183,7 @@ public class DstView extends EntityMP implements Serializable {
* 获取 [标识]
*/
public String getId() {
if(ObjectUtils.isEmpty(id)){
if(ObjectUtils.isEmpty(id)) {
id=(String)getDefaultKey(true);
}
return id;
......@@ -205,7 +205,7 @@ public class DstView extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("viewid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaDataSet.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZDATASET",resultMap = "MetaDataSetResultMap")
@TableName(value = "IBZDATASET", resultMap = "MetaDataSetResultMap")
public class MetaDataSet extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class MetaDataSet extends EntityMP implements Serializable {
* 标识
*/
@DEField(isKeyField = true)
@TableId(value= "datasetid",type=IdType.ASSIGN_UUID)
@TableId(value = "datasetid", type = IdType.ASSIGN_UUID)
@JSONField(name = "dataset_id")
@JsonProperty("dataset_id")
private String datasetId;
......@@ -108,48 +108,48 @@ public class MetaDataSet extends EntityMP implements Serializable {
* 设置 [名称]
*/
public void setDatasetName(String datasetName) {
this.datasetName = datasetName ;
this.modify("datasetname",datasetName);
this.datasetName = datasetName;
this.modify("datasetname", datasetName);
}
/**
* 设置 [实体标识]
*/
public void setEntityId(String entityId) {
this.entityId = entityId ;
this.modify("entityid",entityId);
this.entityId = entityId;
this.modify("entityid", entityId);
}
/**
* 设置 [实体]
*/
public void setEntityName(String entityName) {
this.entityName = entityName ;
this.modify("entityname",entityName);
this.entityName = entityName;
this.modify("entityname", entityName);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName ;
this.modify("codename",codeName);
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [代码]
*/
public void setDsCode(String dsCode) {
this.dsCode = dsCode ;
this.modify("dscode",dsCode);
this.dsCode = dsCode;
this.modify("dscode", dsCode);
}
/**
* 设置 [模型]
*/
public void setDsModel(String dsModel) {
this.dsModel = dsModel ;
this.modify("dsmodel",dsModel);
this.dsModel = dsModel;
this.modify("dsmodel", dsModel);
}
......@@ -157,7 +157,7 @@ public class MetaDataSet extends EntityMP implements Serializable {
* 获取 [标识]
*/
public String getDatasetId() {
if(ObjectUtils.isEmpty(datasetId)){
if(ObjectUtils.isEmpty(datasetId)) {
datasetId=(String)getDefaultKey(true);
}
return datasetId;
......@@ -179,7 +179,7 @@ public class MetaDataSet extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("datasetid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaField.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZFIELD",resultMap = "MetaFieldResultMap")
@TableName(value = "IBZFIELD", resultMap = "MetaFieldResultMap")
public class MetaField extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -47,7 +47,7 @@ public class MetaField extends EntityMP implements Serializable {
* 属性标识
*/
@DEField(isKeyField = true)
@TableId(value= "fieldid",type=IdType.ASSIGN_UUID)
@TableId(value = "fieldid", type = IdType.ASSIGN_UUID)
@JSONField(name = "field_id")
@JsonProperty("field_id")
private String fieldId;
......@@ -293,192 +293,192 @@ public class MetaField extends EntityMP implements Serializable {
* 设置 [属性名称]
*/
public void setFieldName(String fieldName) {
this.fieldName = fieldName ;
this.modify("fieldname",fieldName);
this.fieldName = fieldName;
this.modify("fieldname", fieldName);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName ;
this.modify("codename",codeName);
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [实体标识]
*/
public void setEntityId(String entityId) {
this.entityId = entityId ;
this.modify("entityid",entityId);
this.entityId = entityId;
this.modify("entityid", entityId);
}
/**
* 设置 [实体名称]
*/
public void setEntityName(String entityName) {
this.entityName = entityName ;
this.modify("entityname",entityName);
this.entityName = entityName;
this.modify("entityname", entityName);
}
/**
* 设置 [属性逻辑名]
*/
public void setFieldLogicName(String fieldLogicName) {
this.fieldLogicName = fieldLogicName ;
this.modify("fieldlogicname",fieldLogicName);
this.fieldLogicName = fieldLogicName;
this.modify("fieldlogicname", fieldLogicName);
}
/**
* 设置 [引用属性标识]
*/
public void setRefFieldId(String refFieldId) {
this.refFieldId = refFieldId ;
this.modify("reffieldid",refFieldId);
this.refFieldId = refFieldId;
this.modify("reffieldid", refFieldId);
}
/**
* 设置 [引用属性名称]
*/
public void setRefFieldName(String refFieldName) {
this.refFieldName = refFieldName ;
this.modify("reffieldname",refFieldName);
this.refFieldName = refFieldName;
this.modify("reffieldname", refFieldName);
}
/**
* 设置 [引用关系标识]
*/
public void setRelationId(String relationId) {
this.relationId = relationId ;
this.modify("relationid",relationId);
this.relationId = relationId;
this.modify("relationid", relationId);
}
/**
* 设置 [引用关系]
*/
public void setRelationName(String relationName) {
this.relationName = relationName ;
this.modify("relationname",relationName);
this.relationName = relationName;
this.modify("relationname", relationName);
}
/**
* 设置 [主键]
*/
public void setKeyField(Integer keyField) {
this.keyField = keyField ;
this.modify("keyfield",keyField);
this.keyField = keyField;
this.modify("keyfield", keyField);
}
/**
* 设置 [主信息]
*/
public void setMajorField(Integer majorField) {
this.majorField = majorField ;
this.modify("majorfield",majorField);
this.majorField = majorField;
this.modify("majorfield", majorField);
}
/**
* 设置 [联合主键]
*/
public void setUnionKey(String unionKey) {
this.unionKey = unionKey ;
this.modify("unionkey",unionKey);
this.unionKey = unionKey;
this.modify("unionkey", unionKey);
}
/**
* 设置 [属性类型]
*/
public void setFieldType(String fieldType) {
this.fieldType = fieldType ;
this.modify("fieldtype",fieldType);
this.fieldType = fieldType;
this.modify("fieldtype", fieldType);
}
/**
* 设置 [预定义类型]
*/
public void setPredefined(String predefined) {
this.predefined = predefined ;
this.modify("predefined",predefined);
this.predefined = predefined;
this.modify("predefined", predefined);
}
/**
* 设置 [数据字典]
*/
public void setDict(String dict) {
this.dict = dict ;
this.modify("dict",dict);
this.dict = dict;
this.modify("dict", dict);
}
/**
* 设置 [允许为空]
*/
public void setNullable(Integer nullable) {
this.nullable = nullable ;
this.modify("nullable",nullable);
this.nullable = nullable;
this.modify("nullable", nullable);
}
/**
* 设置 [物理属性]
*/
public void setPhysicalField(Integer physicalField) {
this.physicalField = physicalField ;
this.modify("physicalfield",physicalField);
this.physicalField = physicalField;
this.modify("physicalfield", physicalField);
}
/**
* 设置 [数据类型]
*/
public void setDataType(String dataType) {
this.dataType = dataType ;
this.modify("datatype",dataType);
this.dataType = dataType;
this.modify("datatype", dataType);
}
/**
* 设置 [长度]
*/
public void setDataLength(Integer dataLength) {
this.dataLength = dataLength ;
this.modify("datalength",dataLength);
this.dataLength = dataLength;
this.modify("datalength", dataLength);
}
/**
* 设置 [精度]
*/
public void setDataPreci(Integer dataPreci) {
this.dataPreci = dataPreci ;
this.modify("datapreci",dataPreci);
this.dataPreci = dataPreci;
this.modify("datapreci", dataPreci);
}
/**
* 设置 [逻辑表达式]
*/
public void setExpression(String expression) {
this.expression = expression ;
this.modify("expression",expression);
this.expression = expression;
this.modify("expression", expression);
}
/**
* 设置 [扩展属性]
*/
public void setExtensionField(Integer extensionField) {
this.extensionField = extensionField ;
this.modify("extensionfield",extensionField);
this.extensionField = extensionField;
this.modify("extensionfield", extensionField);
}
/**
* 设置 [审计]
*/
public void setIsEnableAudit(Integer isEnableAudit) {
this.isEnableAudit = isEnableAudit ;
this.modify("isenableaudit",isEnableAudit);
this.isEnableAudit = isEnableAudit;
this.modify("isenableaudit", isEnableAudit);
}
/**
* 设置 [排序]
*/
public void setShowOrder(Integer showOrder) {
this.showOrder = showOrder ;
this.modify("showorder",showOrder);
this.showOrder = showOrder;
this.modify("showorder", showOrder);
}
......@@ -486,7 +486,7 @@ public class MetaField extends EntityMP implements Serializable {
* 获取 [属性标识]
*/
public String getFieldId() {
if(ObjectUtils.isEmpty(fieldId)){
if(ObjectUtils.isEmpty(fieldId)) {
fieldId=(String)getDefaultKey(true);
}
return fieldId;
......@@ -508,7 +508,7 @@ public class MetaField extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("fieldid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaLookup.java
浏览文件 @ 739701e4
......@@ -39,7 +39,7 @@ public class MetaLookup extends EntityBase implements Serializable {
/**
* 标识
*/
@DEField(isKeyField=true)
@DEField(isKeyField = true)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaModel.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZMODEL",resultMap = "MetaModelResultMap")
@TableName(value = "IBZMODEL", resultMap = "MetaModelResultMap")
public class MetaModel extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class MetaModel extends EntityMP implements Serializable {
/**
* 标识
*/
@DEField(name = "modelid" , isKeyField = true)
@TableId(value= "modelid",type=IdType.ASSIGN_UUID)
@DEField(name = "modelid", isKeyField = true)
@TableId(value = "modelid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -81,24 +81,24 @@ public class MetaModel extends EntityMP implements Serializable {
* 设置 [名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("modelname",name);
this.name = name;
this.modify("modelname", name);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName ;
this.modify("codename",codeName);
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [配置]
*/
public void setConfig(String config) {
this.config = config ;
this.modify("modelcfg",config);
this.config = config;
this.modify("modelcfg", config);
}
......@@ -112,7 +112,7 @@ public class MetaModel extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("modelid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaModule.java
浏览文件 @ 739701e4
......@@ -26,56 +26,132 @@ import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/**
* [模块] 对象
* 实体[模块]
*/
@Builder
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class MetaModule extends EntityBase implements Serializable {
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZMODULE", resultMap = "MetaModuleResultMap")
public class MetaModule extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 模块标识
*/
@DEField(name = "moduleid" , isKeyField=true)
@DEField(name = "moduleid", isKeyField = true)
@TableId(value = "moduleid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
/**
* 模块名称
*/
@DEField(name = "modulename")
@TableField(value = "modulename")
@JSONField(name = "name")
@JsonProperty("name")
private String name;
/**
* 代码名称
*/
@JSONField(name = "codeName")
@JsonProperty("codeName")
private String codename;
@TableField(value = "codename")
@JSONField(name = "code_name")
@JsonProperty("code_name")
private String codeName;
/**
* 系统标识
*/
@JSONField(name = "systemId")
@JsonProperty("systemId")
private String systemid;
@TableField(value = "systemid")
@JSONField(name = "system_id")
@JsonProperty("system_id")
private String systemId;
/**
* 排序
*/
@TableField(value = "showorder")
@JSONField(name = "show_order")
@JsonProperty("show_order")
private Integer showOrder;
/**
*
*/
@JSONField(name = "system")
@JsonProperty("system")
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.lite.domain.DstSystem system;
/**
* 设置 [模块名称]
*/
public void setName(String name) {
this.name = name;
this.modify("modulename", name);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [系统标识]
*/
public void setSystemId(String systemId) {
this.systemId = systemId;
this.modify("systemid", systemId);
}
/**
* 设置 [排序]
*/
public void setShowOrder(Integer showOrder) {
this.showOrder = showOrder;
this.modify("showorder", showOrder);
}
/**
* 获取 [模块标识]
*/
public String getId() {
if(ObjectUtils.isEmpty(id)) {
id=(String)getDefaultKey(true);
}
return id;
}
@Override
public Serializable getDefaultKey(boolean gen) {
if((!ObjectUtils.isEmpty(this.getSystemId()))&&(!ObjectUtils.isEmpty(this.getCodeName())))
return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getSystemId(),this.getCodeName()).getBytes());
return null;
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
* @param targetEntity 目标数据对象
* @param bIncEmpty 是否包括空值
* @param <T>
* @return
*/
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("moduleid");
return super.copyTo(targetEntity, bIncEmpty);
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/domain/MetaRelationship.java
浏览文件 @ 739701e4
......@@ -38,7 +38,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@Setter
@NoArgsConstructor
@JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZRELATION",resultMap = "MetaRelationshipResultMap")
@TableName(value = "IBZRELATION", resultMap = "MetaRelationshipResultMap")
public class MetaRelationship extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -46,8 +46,8 @@ public class MetaRelationship extends EntityMP implements Serializable {
/**
* 关系标识
*/
@DEField(name = "relationid" , isKeyField = true)
@TableId(value= "relationid",type=IdType.ASSIGN_UUID)
@DEField(name = "relationid", isKeyField = true)
@TableId(value = "relationid", type = IdType.ASSIGN_UUID)
@JSONField(name = "id")
@JsonProperty("id")
private String id;
......@@ -146,72 +146,72 @@ public class MetaRelationship extends EntityMP implements Serializable {
* 设置 [lookup]
*/
public void setLookup(List<cn.ibizlab.core.lite.domain.MetaLookup> lookup) {
this.lookup = lookup ;
this.modify("lookup",(lookup!=null)?lookup:(new ArrayList()));
this.lookup = lookup;
this.modify("lookup", (lookup!=null)?lookup:(new ArrayList()));
}
/**
* 设置 [关系名称]
*/
public void setName(String name) {
this.name = name ;
this.modify("relationname",name);
this.name = name;
this.modify("relationname", name);
}
/**
* 设置 [类型]
*/
public void setRelationType(String relationType) {
this.relationType = relationType ;
this.modify("reltype",relationType);
this.relationType = relationType;
this.modify("reltype", relationType);
}
/**
* 设置 [代码名称]
*/
public void setCodeName(String codeName) {
this.codeName = codeName ;
this.modify("codename",codeName);
this.codeName = codeName;
this.modify("codename", codeName);
}
/**
* 设置 [实体标识]
*/
public void setEntityId(String entityId) {
this.entityId = entityId ;
this.modify("entityid",entityId);
this.entityId = entityId;
this.modify("entityid", entityId);
}
/**
* 设置 [实体名称]
*/
public void setEntityName(String entityName) {
this.entityName = entityName ;
this.modify("entityname",entityName);
this.entityName = entityName;
this.modify("entityname", entityName);
}
/**
* 设置 [引用实体标识]
*/
public void setRefEntityId(String refEntityId) {
this.refEntityId = refEntityId ;
this.modify("refentityid",refEntityId);
this.refEntityId = refEntityId;
this.modify("refentityid", refEntityId);
}
/**
* 设置 [引用实体名称]
*/
public void setRefEntityName(String refEntityName) {
this.refEntityName = refEntityName ;
this.modify("refentityname",refEntityName);
this.refEntityName = refEntityName;
this.modify("refentityname", refEntityName);
}
/**
* 设置 [嵌套代码名称]
*/
public void setNestedName(String nestedName) {
this.nestedName = nestedName ;
this.modify("nestedname",nestedName);
this.nestedName = nestedName;
this.modify("nestedname", nestedName);
}
......@@ -219,7 +219,7 @@ public class MetaRelationship extends EntityMP implements Serializable {
* 获取 [关系标识]
*/
public String getId() {
if(ObjectUtils.isEmpty(id)){
if(ObjectUtils.isEmpty(id)) {
id=(String)getDefaultKey(true);
}
return id;
......@@ -241,7 +241,7 @@ public class MetaRelationship extends EntityMP implements Serializable {
@Override
public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
this.reset("relationid");
return super.copyTo(targetEntity,bIncEmpty);
return super.copyTo(targetEntity, bIncEmpty);
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaEntitySearchContext.java
浏览文件 @ 739701e4
......@@ -97,6 +97,27 @@ public class MetaEntitySearchContext extends QueryWrapperContext<MetaEntity> {
this.getSearchCond().like("dsname", n_dsname_like);
}
}
private String n_moduleid_eq;//[模块标识]
public void setN_moduleid_eq(String n_moduleid_eq) {
this.n_moduleid_eq = n_moduleid_eq;
if(!ObjectUtils.isEmpty(this.n_moduleid_eq)){
this.getSearchCond().eq("moduleid", n_moduleid_eq);
}
}
private String n_modulename_eq;//[模块]
public void setN_modulename_eq(String n_modulename_eq) {
this.n_modulename_eq = n_modulename_eq;
if(!ObjectUtils.isEmpty(this.n_modulename_eq)){
this.getSearchCond().eq("modulename", n_modulename_eq);
}
}
private String n_modulename_like;//[模块]
public void setN_modulename_like(String n_modulename_like) {
this.n_modulename_like = n_modulename_like;
if(!ObjectUtils.isEmpty(this.n_modulename_like)){
this.getSearchCond().like("modulename", n_modulename_like);
}
}
/**
* 启用快速搜索
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/filter/MetaModuleSearchContext.java
浏览文件 @ 739701e4
......@@ -17,20 +17,52 @@ import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import cn.ibizlab.util.filter.SearchContextBase;
import cn.ibizlab.util.filter.QueryWrapperContext;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.ibizlab.core.lite.domain.MetaModule;
/**
* ServiceApi数据实体[MetaModule] 查询条件对象
* 关系型数据实体[MetaModule] 查询条件对象
*/
@Slf4j
@Data
public class MetaModuleSearchContext extends SearchContextBase {
private String n_modulename_like;//[模块名称]
public class MetaModuleSearchContext extends QueryWrapperContext<MetaModule> {
private String n_modulename_like;//[模块名称]
public void setN_modulename_like(String n_modulename_like) {
this.n_modulename_like = n_modulename_like;
if(!ObjectUtils.isEmpty(this.n_modulename_like)){
this.getSearchCond().like("modulename", n_modulename_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_systemid_eq;//[系统标识]
public void setN_systemid_eq(String n_systemid_eq) {
this.n_systemid_eq = n_systemid_eq;
if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
this.getSearchCond().eq("systemid", n_systemid_eq);
}
}
/**
* 启用快速搜索
*/
@Override
public void setQuery(String query)
{
this.query=query;
if(!StringUtils.isEmpty(query)){
this.getSearchCond().and( wrapper ->
wrapper.like("modulename", query)
);
}
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstComponentMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstComponentMapper extends BaseMapper<DstComponent>{
public interface DstComponentMapper extends BaseMapper<DstComponent> {
Page<DstComponent> searchDefault(IPage page, @Param("srf") DstComponentSearchContext context, @Param("ew") Wrapper<DstComponent> wrapper) ;
Page<DstComponent> searchDefault(IPage page, @Param("srf") DstComponentSearchContext context, @Param("ew") Wrapper<DstComponent> wrapper);
@Override
DstComponent selectById(Serializable id);
@Override
......@@ -62,10 +62,10 @@ public interface DstComponentMapper extends BaseMapper<DstComponent>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<DstComponent> selectByAppId(@Param("id") Serializable id) ;
List<DstComponent> selectByAppId(@Param("id") Serializable id);
List<DstComponent> selectBySystemId(@Param("pssystemid") Serializable pssystemid) ;
List<DstComponent> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
List<DstComponent> selectByEntityId(@Param("entity_id") Serializable entity_id) ;
List<DstComponent> selectByEntityId(@Param("entity_id") Serializable entity_id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstConfigMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstConfigMapper extends BaseMapper<DstConfig>{
public interface DstConfigMapper extends BaseMapper<DstConfig> {
Page<DstConfig> searchDefault(IPage page, @Param("srf") DstConfigSearchContext context, @Param("ew") Wrapper<DstConfig> wrapper) ;
Page<DstConfig> searchDefault(IPage page, @Param("srf") DstConfigSearchContext context, @Param("ew") Wrapper<DstConfig> wrapper);
@Override
DstConfig selectById(Serializable id);
@Override
......@@ -62,6 +62,6 @@ public interface DstConfigMapper extends BaseMapper<DstConfig>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<DstConfig> selectBySystemId(@Param("pssystemid") Serializable pssystemid) ;
List<DstConfig> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstDataSourceMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstDataSourceMapper extends BaseMapper<DstDataSource>{
public interface DstDataSourceMapper extends BaseMapper<DstDataSource> {
Page<DstDataSource> searchDefault(IPage page, @Param("srf") DstDataSourceSearchContext context, @Param("ew") Wrapper<DstDataSource> wrapper) ;
Page<DstDataSource> searchDefault(IPage page, @Param("srf") DstDataSourceSearchContext context, @Param("ew") Wrapper<DstDataSource> wrapper);
@Override
DstDataSource selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstRouterMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstRouterMapper extends BaseMapper<DstRouter>{
public interface DstRouterMapper extends BaseMapper<DstRouter> {
Page<DstRouter> searchDefault(IPage page, @Param("srf") DstRouterSearchContext context, @Param("ew") Wrapper<DstRouter> wrapper) ;
Page<DstRouter> searchDefault(IPage page, @Param("srf") DstRouterSearchContext context, @Param("ew") Wrapper<DstRouter> wrapper);
@Override
DstRouter selectById(Serializable id);
@Override
......@@ -62,10 +62,10 @@ public interface DstRouterMapper extends BaseMapper<DstRouter>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<DstRouter> selectByAppId(@Param("id") Serializable id) ;
List<DstRouter> selectByAppId(@Param("id") Serializable id);
List<DstRouter> selectByParentid(@Param("id") Serializable id) ;
List<DstRouter> selectByParentid(@Param("id") Serializable id);
List<DstRouter> selectBySystemId(@Param("pssystemid") Serializable pssystemid) ;
List<DstRouter> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstSystemMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstSystemMapper extends BaseMapper<DstSystem>{
public interface DstSystemMapper extends BaseMapper<DstSystem> {
Page<DstSystem> searchDefault(IPage page, @Param("srf") DstSystemSearchContext context, @Param("ew") Wrapper<DstSystem> wrapper) ;
Page<DstSystem> searchDefault(IPage page, @Param("srf") DstSystemSearchContext context, @Param("ew") Wrapper<DstSystem> wrapper);
@Override
DstSystem selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstViewMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface DstViewMapper extends BaseMapper<DstView>{
public interface DstViewMapper extends BaseMapper<DstView> {
Page<DstView> searchDefault(IPage page, @Param("srf") DstViewSearchContext context, @Param("ew") Wrapper<DstView> wrapper) ;
Page<DstView> searchDefault(IPage page, @Param("srf") DstViewSearchContext context, @Param("ew") Wrapper<DstView> wrapper);
@Override
DstView selectById(Serializable id);
@Override
......@@ -62,10 +62,10 @@ public interface DstViewMapper extends BaseMapper<DstView>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<DstView> selectByAppId(@Param("id") Serializable id) ;
List<DstView> selectByAppId(@Param("id") Serializable id);
List<DstView> selectBySystemId(@Param("pssystemid") Serializable pssystemid) ;
List<DstView> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
List<DstView> selectByEntityId(@Param("entity_id") Serializable entity_id) ;
List<DstView> selectByEntityId(@Param("entity_id") Serializable entity_id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDataSetMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaDataSetMapper extends BaseMapper<MetaDataSet>{
public interface MetaDataSetMapper extends BaseMapper<MetaDataSet> {
Page<MetaDataSet> searchDefault(IPage page, @Param("srf") MetaDataSetSearchContext context, @Param("ew") Wrapper<MetaDataSet> wrapper) ;
Page<MetaDataSet> searchDefault(IPage page, @Param("srf") MetaDataSetSearchContext context, @Param("ew") Wrapper<MetaDataSet> wrapper);
@Override
MetaDataSet selectById(Serializable id);
@Override
......@@ -62,6 +62,6 @@ public interface MetaDataSetMapper extends BaseMapper<MetaDataSet>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<MetaDataSet> selectByEntityId(@Param("entity_id") Serializable entity_id) ;
List<MetaDataSet> selectByEntityId(@Param("entity_id") Serializable entity_id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaEntityMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaEntityMapper extends BaseMapper<MetaEntity>{
public interface MetaEntityMapper extends BaseMapper<MetaEntity> {
Page<MetaEntity> searchDefault(IPage page, @Param("srf") MetaEntitySearchContext context, @Param("ew") Wrapper<MetaEntity> wrapper) ;
Page<MetaEntity> searchDefault(IPage page, @Param("srf") MetaEntitySearchContext context, @Param("ew") Wrapper<MetaEntity> wrapper);
@Override
MetaEntity selectById(Serializable id);
@Override
......@@ -62,8 +62,10 @@ public interface MetaEntityMapper extends BaseMapper<MetaEntity>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<MetaEntity> selectByDsId(@Param("ds_id") Serializable ds_id) ;
List<MetaEntity> selectByDsId(@Param("ds_id") Serializable ds_id);
List<MetaEntity> selectBySystemId(@Param("pssystemid") Serializable pssystemid) ;
List<MetaEntity> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
List<MetaEntity> selectByModuleId(@Param("id") Serializable id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaFieldMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaFieldMapper extends BaseMapper<MetaField>{
public interface MetaFieldMapper extends BaseMapper<MetaField> {
Page<MetaField> searchDefault(IPage page, @Param("srf") MetaFieldSearchContext context, @Param("ew") Wrapper<MetaField> wrapper) ;
Page<MetaField> searchDefault(IPage page, @Param("srf") MetaFieldSearchContext context, @Param("ew") Wrapper<MetaField> wrapper);
@Override
MetaField selectById(Serializable id);
@Override
......@@ -62,10 +62,10 @@ public interface MetaFieldMapper extends BaseMapper<MetaField>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<MetaField> selectByEntityId(@Param("entity_id") Serializable entity_id) ;
List<MetaField> selectByEntityId(@Param("entity_id") Serializable entity_id);
List<MetaField> selectByRefFieldId(@Param("field_id") Serializable field_id) ;
List<MetaField> selectByRefFieldId(@Param("field_id") Serializable field_id);
List<MetaField> selectByRelationId(@Param("id") Serializable id) ;
List<MetaField> selectByRelationId(@Param("id") Serializable id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModelMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaModelMapper extends BaseMapper<MetaModel>{
public interface MetaModelMapper extends BaseMapper<MetaModel> {
Page<MetaModel> searchDefault(IPage page, @Param("srf") MetaModelSearchContext context, @Param("ew") Wrapper<MetaModel> wrapper) ;
Page<MetaModel> searchDefault(IPage page, @Param("srf") MetaModelSearchContext context, @Param("ew") Wrapper<MetaModel> wrapper);
@Override
MetaModel selectById(Serializable id);
@Override
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModuleMapper.java 0 → 100644
浏览文件 @ 739701e4
package cn.ibizlab.core.lite.mapper;
import java.util.List;
import org.apache.ibatis.annotations.*;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaModule;
import cn.ibizlab.core.lite.filter.MetaModuleSearchContext;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaModuleMapper extends BaseMapper<MetaModule> {
Page<MetaModule> searchDefault(IPage page, @Param("srf") MetaModuleSearchContext context, @Param("ew") Wrapper<MetaModule> wrapper);
@Override
MetaModule selectById(Serializable id);
@Override
int insert(MetaModule entity);
@Override
int updateById(@Param(Constants.ENTITY) MetaModule entity);
@Override
int update(@Param(Constants.ENTITY) MetaModule entity, @Param("ew") Wrapper<MetaModule> updateWrapper);
@Override
int deleteById(Serializable id);
/**
* 自定义查询SQL
* @param sql
* @return
*/
@Select("${sql}")
List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
/**
* 自定义更新SQL
* @param sql
* @return
*/
@Update("${sql}")
boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
/**
* 自定义插入SQL
* @param sql
* @return
*/
@Insert("${sql}")
boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
/**
* 自定义删除SQL
* @param sql
* @return
*/
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<MetaModule> selectBySystemId(@Param("pssystemid") Serializable pssystemid);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaRelationshipMapper.java
浏览文件 @ 739701e4
......@@ -17,9 +17,9 @@ import java.io.Serializable;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.alibaba.fastjson.JSONObject;
public interface MetaRelationshipMapper extends BaseMapper<MetaRelationship>{
public interface MetaRelationshipMapper extends BaseMapper<MetaRelationship> {
Page<MetaRelationship> searchDefault(IPage page, @Param("srf") MetaRelationshipSearchContext context, @Param("ew") Wrapper<MetaRelationship> wrapper) ;
Page<MetaRelationship> searchDefault(IPage page, @Param("srf") MetaRelationshipSearchContext context, @Param("ew") Wrapper<MetaRelationship> wrapper);
@Override
MetaRelationship selectById(Serializable id);
@Override
......@@ -62,8 +62,8 @@ public interface MetaRelationshipMapper extends BaseMapper<MetaRelationship>{
@Delete("${sql}")
boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
List<MetaRelationship> selectByEntityId(@Param("entity_id") Serializable entity_id) ;
List<MetaRelationship> selectByEntityId(@Param("entity_id") Serializable entity_id);
List<MetaRelationship> selectByRefEntityId(@Param("entity_id") Serializable entity_id) ;
List<MetaRelationship> selectByRefEntityId(@Param("entity_id") Serializable entity_id);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstAPIService.java
浏览文件 @ 739701e4
......@@ -22,20 +22,20 @@ import cn.ibizlab.core.lite.filter.DstAPISearchContext;
/**
* 实体[DstAPI] 服务对象接口
*/
public interface IDstAPIService{
boolean create(DstAPI et) ;
void createBatch(List<DstAPI> list) ;
boolean update(DstAPI et) ;
void updateBatch(List<DstAPI> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstAPI get(String key) ;
DstAPI getDraft(DstAPI et) ;
boolean checkKey(DstAPI et) ;
boolean save(DstAPI et) ;
void saveBatch(List<DstAPI> list) ;
Page<DstAPI> searchDefault(DstAPISearchContext context) ;
public interface IDstAPIService {
boolean create(DstAPI et);
void createBatch(List<DstAPI> list);
boolean update(DstAPI et);
void updateBatch(List<DstAPI> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstAPI get(String key);
DstAPI getDraft(DstAPI et);
boolean checkKey(DstAPI et);
boolean save(DstAPI et);
void saveBatch(List<DstAPI> list);
Page<DstAPI> searchDefault(DstAPISearchContext context);
List<DstAPI> selectByMsId(String id);
void removeByMsId(String id);
List<DstAPI> selectBySystemId(String pssystemid);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstAppService.java
浏览文件 @ 739701e4
......@@ -22,20 +22,20 @@ import cn.ibizlab.core.lite.filter.DstAppSearchContext;
/**
* 实体[DstApp] 服务对象接口
*/
public interface IDstAppService{
boolean create(DstApp et) ;
void createBatch(List<DstApp> list) ;
boolean update(DstApp et) ;
void updateBatch(List<DstApp> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstApp get(String key) ;
DstApp getDraft(DstApp et) ;
boolean checkKey(DstApp et) ;
boolean save(DstApp et) ;
void saveBatch(List<DstApp> list) ;
Page<DstApp> searchDefault(DstAppSearchContext context) ;
public interface IDstAppService {
boolean create(DstApp et);
void createBatch(List<DstApp> list);
boolean update(DstApp et);
void updateBatch(List<DstApp> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstApp get(String key);
DstApp getDraft(DstApp et);
boolean checkKey(DstApp et);
boolean save(DstApp et);
void saveBatch(List<DstApp> list);
Page<DstApp> searchDefault(DstAppSearchContext context);
List<DstApp> selectBySystemid(String pssystemid);
void removeBySystemid(String pssystemid);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstComponentService.java
浏览文件 @ 739701e4
......@@ -23,21 +23,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstComponent] 服务对象接口
*/
public interface IDstComponentService extends IService<DstComponent>{
public interface IDstComponentService extends IService<DstComponent> {
boolean create(DstComponent et) ;
void createBatch(List<DstComponent> list) ;
boolean update(DstComponent et) ;
void updateBatch(List<DstComponent> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstComponent get(String key) ;
DstComponent getDraft(DstComponent et) ;
boolean checkKey(DstComponent et) ;
boolean save(DstComponent et) ;
void saveBatch(List<DstComponent> list) ;
DstComponent sync(DstComponent et) ;
Page<DstComponent> searchDefault(DstComponentSearchContext context) ;
boolean create(DstComponent et);
void createBatch(List<DstComponent> list);
boolean update(DstComponent et);
void updateBatch(List<DstComponent> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstComponent get(String key);
DstComponent getDraft(DstComponent et);
boolean checkKey(DstComponent et);
boolean save(DstComponent et);
void saveBatch(List<DstComponent> list);
DstComponent sync(DstComponent et);
Page<DstComponent> searchDefault(DstComponentSearchContext context);
List<DstComponent> selectByAppId(String id);
void removeByAppId(String id);
List<DstComponent> selectBySystemId(String pssystemid);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstConfigService.java
浏览文件 @ 739701e4
......@@ -23,21 +23,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstConfig] 服务对象接口
*/
public interface IDstConfigService extends IService<DstConfig>{
boolean create(DstConfig et) ;
void createBatch(List<DstConfig> list) ;
boolean update(DstConfig et) ;
void updateBatch(List<DstConfig> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstConfig get(String key) ;
DstConfig getDraft(DstConfig et) ;
boolean checkKey(DstConfig et) ;
DstConfig reset(DstConfig et) ;
boolean save(DstConfig et) ;
void saveBatch(List<DstConfig> list) ;
Page<DstConfig> searchDefault(DstConfigSearchContext context) ;
public interface IDstConfigService extends IService<DstConfig> {
boolean create(DstConfig et);
void createBatch(List<DstConfig> list);
boolean update(DstConfig et);
void updateBatch(List<DstConfig> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstConfig get(String key);
DstConfig getDraft(DstConfig et);
boolean checkKey(DstConfig et);
DstConfig reset(DstConfig et);
boolean save(DstConfig et);
void saveBatch(List<DstConfig> list);
Page<DstConfig> searchDefault(DstConfigSearchContext context);
List<DstConfig> selectBySystemId(String pssystemid);
void removeBySystemId(String pssystemid);
/**
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstDataSourceService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstDataSource] 服务对象接口
*/
public interface IDstDataSourceService extends IService<DstDataSource>{
boolean create(DstDataSource et) ;
void createBatch(List<DstDataSource> list) ;
boolean update(DstDataSource et) ;
void updateBatch(List<DstDataSource> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstDataSource get(String key) ;
DstDataSource getDraft(DstDataSource et) ;
boolean checkKey(DstDataSource et) ;
boolean save(DstDataSource et) ;
void saveBatch(List<DstDataSource> list) ;
Page<DstDataSource> searchDefault(DstDataSourceSearchContext context) ;
public interface IDstDataSourceService extends IService<DstDataSource> {
boolean create(DstDataSource et);
void createBatch(List<DstDataSource> list);
boolean update(DstDataSource et);
void updateBatch(List<DstDataSource> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstDataSource get(String key);
DstDataSource getDraft(DstDataSource et);
boolean checkKey(DstDataSource et);
boolean save(DstDataSource et);
void saveBatch(List<DstDataSource> list);
Page<DstDataSource> searchDefault(DstDataSourceSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstMicroserviceService.java
浏览文件 @ 739701e4
......@@ -22,22 +22,22 @@ import cn.ibizlab.core.lite.filter.DstMicroserviceSearchContext;
/**
* 实体[DstMicroservice] 服务对象接口
*/
public interface IDstMicroserviceService{
boolean create(DstMicroservice et) ;
void createBatch(List<DstMicroservice> list) ;
boolean update(DstMicroservice et) ;
void updateBatch(List<DstMicroservice> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstMicroservice get(String key) ;
DstMicroservice getDraft(DstMicroservice et) ;
boolean checkKey(DstMicroservice et) ;
boolean save(DstMicroservice et) ;
void saveBatch(List<DstMicroservice> list) ;
Page<DstMicroservice> searchDefault(DstMicroserviceSearchContext context) ;
List<DstMicroservice> selectByPssystemid(String pssystemid);
void removeByPssystemid(String pssystemid);
public interface IDstMicroserviceService {
boolean create(DstMicroservice et);
void createBatch(List<DstMicroservice> list);
boolean update(DstMicroservice et);
void updateBatch(List<DstMicroservice> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstMicroservice get(String key);
DstMicroservice getDraft(DstMicroservice et);
boolean checkKey(DstMicroservice et);
boolean save(DstMicroservice et);
void saveBatch(List<DstMicroservice> list);
Page<DstMicroservice> searchDefault(DstMicroserviceSearchContext context);
List<DstMicroservice> selectBySystemid(String pssystemid);
void removeBySystemid(String pssystemid);
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstRouterService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstRouter] 服务对象接口
*/
public interface IDstRouterService extends IService<DstRouter>{
boolean create(DstRouter et) ;
void createBatch(List<DstRouter> list) ;
boolean update(DstRouter et) ;
void updateBatch(List<DstRouter> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstRouter get(String key) ;
DstRouter getDraft(DstRouter et) ;
boolean checkKey(DstRouter et) ;
boolean save(DstRouter et) ;
void saveBatch(List<DstRouter> list) ;
Page<DstRouter> searchDefault(DstRouterSearchContext context) ;
public interface IDstRouterService extends IService<DstRouter> {
boolean create(DstRouter et);
void createBatch(List<DstRouter> list);
boolean update(DstRouter et);
void updateBatch(List<DstRouter> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstRouter get(String key);
DstRouter getDraft(DstRouter et);
boolean checkKey(DstRouter et);
boolean save(DstRouter et);
void saveBatch(List<DstRouter> list);
Page<DstRouter> searchDefault(DstRouterSearchContext context);
List<DstRouter> selectByAppId(String id);
void removeByAppId(String id);
List<DstRouter> selectByParentid(String id);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstSystemService.java
浏览文件 @ 739701e4
......@@ -23,21 +23,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstSystem] 服务对象接口
*/
public interface IDstSystemService extends IService<DstSystem>{
boolean create(DstSystem et) ;
void createBatch(List<DstSystem> list) ;
boolean update(DstSystem et) ;
void updateBatch(List<DstSystem> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstSystem get(String key) ;
DstSystem getDraft(DstSystem et) ;
boolean checkKey(DstSystem et) ;
boolean save(DstSystem et) ;
void saveBatch(List<DstSystem> list) ;
DstSystem syncSysModel(DstSystem et) ;
Page<DstSystem> searchDefault(DstSystemSearchContext context) ;
public interface IDstSystemService extends IService<DstSystem> {
boolean create(DstSystem et);
void createBatch(List<DstSystem> list);
boolean update(DstSystem et);
void updateBatch(List<DstSystem> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstSystem get(String key);
DstSystem getDraft(DstSystem et);
boolean checkKey(DstSystem et);
boolean save(DstSystem et);
void saveBatch(List<DstSystem> list);
DstSystem syncSysModel(DstSystem et);
Page<DstSystem> searchDefault(DstSystemSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IDstViewService.java
浏览文件 @ 739701e4
......@@ -23,20 +23,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[DstView] 服务对象接口
*/
public interface IDstViewService extends IService<DstView>{
boolean create(DstView et) ;
void createBatch(List<DstView> list) ;
boolean update(DstView et) ;
void updateBatch(List<DstView> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
DstView get(String key) ;
DstView getDraft(DstView et) ;
boolean checkKey(DstView et) ;
boolean save(DstView et) ;
void saveBatch(List<DstView> list) ;
Page<DstView> searchDefault(DstViewSearchContext context) ;
public interface IDstViewService extends IService<DstView> {
boolean create(DstView et);
void createBatch(List<DstView> list);
boolean update(DstView et);
void updateBatch(List<DstView> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
DstView get(String key);
DstView getDraft(DstView et);
boolean checkKey(DstView et);
boolean save(DstView et);
void saveBatch(List<DstView> list);
Page<DstView> searchDefault(DstViewSearchContext context);
List<DstView> selectByAppId(String id);
void removeByAppId(String id);
List<DstView> selectBySystemId(String pssystemid);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaDataSetService.java
浏览文件 @ 739701e4
......@@ -23,23 +23,23 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaDataSet] 服务对象接口
*/
public interface IMetaDataSetService extends IService<MetaDataSet>{
boolean create(MetaDataSet et) ;
void createBatch(List<MetaDataSet> list) ;
boolean update(MetaDataSet et) ;
void updateBatch(List<MetaDataSet> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaDataSet get(String key) ;
MetaDataSet getDraft(MetaDataSet et) ;
boolean checkKey(MetaDataSet et) ;
boolean save(MetaDataSet et) ;
void saveBatch(List<MetaDataSet> list) ;
Page<MetaDataSet> searchDefault(MetaDataSetSearchContext context) ;
public interface IMetaDataSetService extends IService<MetaDataSet> {
boolean create(MetaDataSet et);
void createBatch(List<MetaDataSet> list);
boolean update(MetaDataSet et);
void updateBatch(List<MetaDataSet> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaDataSet get(String key);
MetaDataSet getDraft(MetaDataSet et);
boolean checkKey(MetaDataSet et);
boolean save(MetaDataSet et);
void saveBatch(List<MetaDataSet> list);
Page<MetaDataSet> searchDefault(MetaDataSetSearchContext context);
List<MetaDataSet> selectByEntityId(String entity_id);
void removeByEntityId(String entity_id);
void saveByEntityId(String entity_id,List<MetaDataSet> list) ;
void saveByEntityId(String entity_id, List<MetaDataSet> list) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaEntityService.java
浏览文件 @ 739701e4
......@@ -23,24 +23,26 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaEntity] 服务对象接口
*/
public interface IMetaEntityService extends IService<MetaEntity>{
boolean create(MetaEntity et) ;
void createBatch(List<MetaEntity> list) ;
boolean update(MetaEntity et) ;
void updateBatch(List<MetaEntity> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaEntity get(String key) ;
MetaEntity getDraft(MetaEntity et) ;
boolean checkKey(MetaEntity et) ;
boolean save(MetaEntity et) ;
void saveBatch(List<MetaEntity> list) ;
Page<MetaEntity> searchDefault(MetaEntitySearchContext context) ;
public interface IMetaEntityService extends IService<MetaEntity> {
boolean create(MetaEntity et);
void createBatch(List<MetaEntity> list);
boolean update(MetaEntity et);
void updateBatch(List<MetaEntity> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaEntity get(String key);
MetaEntity getDraft(MetaEntity et);
boolean checkKey(MetaEntity et);
boolean save(MetaEntity et);
void saveBatch(List<MetaEntity> list);
Page<MetaEntity> searchDefault(MetaEntitySearchContext context);
List<MetaEntity> selectByDsId(String ds_id);
void removeByDsId(String ds_id);
List<MetaEntity> selectBySystemId(String pssystemid);
void removeBySystemId(String pssystemid);
List<MetaEntity> selectByModuleId(String id);
void removeByModuleId(String id);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaFieldService.java
浏览文件 @ 739701e4
......@@ -23,23 +23,23 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaField] 服务对象接口
*/
public interface IMetaFieldService extends IService<MetaField>{
public interface IMetaFieldService extends IService<MetaField> {
boolean create(MetaField et) ;
void createBatch(List<MetaField> list) ;
boolean update(MetaField et) ;
void updateBatch(List<MetaField> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaField get(String key) ;
MetaField getDraft(MetaField et) ;
boolean checkKey(MetaField et) ;
boolean save(MetaField et) ;
void saveBatch(List<MetaField> list) ;
Page<MetaField> searchDefault(MetaFieldSearchContext context) ;
boolean create(MetaField et);
void createBatch(List<MetaField> list);
boolean update(MetaField et);
void updateBatch(List<MetaField> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaField get(String key);
MetaField getDraft(MetaField et);
boolean checkKey(MetaField et);
boolean save(MetaField et);
void saveBatch(List<MetaField> list);
Page<MetaField> searchDefault(MetaFieldSearchContext context);
List<MetaField> selectByEntityId(String entity_id);
void removeByEntityId(String entity_id);
void saveByEntityId(String entity_id,List<MetaField> list) ;
void saveByEntityId(String entity_id, List<MetaField> list) ;
List<MetaField> selectByRefFieldId(String field_id);
void removeByRefFieldId(String field_id);
List<MetaField> selectByRelationId(String id);
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaLookupService.java
浏览文件 @ 739701e4
......@@ -22,23 +22,23 @@ 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) ;
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) ;
void saveByRelationid(String id, List<MetaLookup> list) ;
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaModelService.java
浏览文件 @ 739701e4
......@@ -23,21 +23,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaModel] 服务对象接口
*/
public interface IMetaModelService extends IService<MetaModel>{
boolean create(MetaModel et) ;
void createBatch(List<MetaModel> list) ;
boolean update(MetaModel et) ;
void updateBatch(List<MetaModel> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaModel get(String key) ;
MetaModel getDraft(MetaModel et) ;
MetaModel change(MetaModel et) ;
boolean checkKey(MetaModel et) ;
boolean save(MetaModel et) ;
void saveBatch(List<MetaModel> list) ;
Page<MetaModel> searchDefault(MetaModelSearchContext context) ;
public interface IMetaModelService extends IService<MetaModel> {
boolean create(MetaModel et);
void createBatch(List<MetaModel> list);
boolean update(MetaModel et);
void updateBatch(List<MetaModel> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaModel get(String key);
MetaModel getDraft(MetaModel et);
MetaModel change(MetaModel et);
boolean checkKey(MetaModel et);
boolean save(MetaModel et);
void saveBatch(List<MetaModel> list);
Page<MetaModel> searchDefault(MetaModelSearchContext context);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaModuleService.java
浏览文件 @ 739701e4
......@@ -18,28 +18,42 @@ import org.springframework.cache.annotation.CacheEvict;
import cn.ibizlab.core.lite.domain.MetaModule;
import cn.ibizlab.core.lite.filter.MetaModuleSearchContext;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaModule] 服务对象接口
*/
public interface IMetaModuleService{
boolean create(MetaModule et) ;
void createBatch(List<MetaModule> list) ;
boolean update(MetaModule et) ;
void updateBatch(List<MetaModule> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaModule get(String key) ;
MetaModule getDraft(MetaModule et) ;
boolean checkKey(MetaModule et) ;
boolean save(MetaModule et) ;
void saveBatch(List<MetaModule> list) ;
Page<MetaModule> searchDefault(MetaModuleSearchContext context) ;
List<MetaModule> selectBySystemid(String pssystemid);
void removeBySystemid(String pssystemid);
public interface IMetaModuleService extends IService<MetaModule> {
boolean create(MetaModule et);
void createBatch(List<MetaModule> list);
boolean update(MetaModule et);
void updateBatch(List<MetaModule> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaModule get(String key);
MetaModule getDraft(MetaModule et);
boolean checkKey(MetaModule et);
boolean save(MetaModule et);
void saveBatch(List<MetaModule> list);
Page<MetaModule> searchDefault(MetaModuleSearchContext context);
List<MetaModule> selectBySystemId(String pssystemid);
void removeBySystemId(String pssystemid);
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return select * from table where id = '1'
*/
List<JSONObject> select(String sql, Map param);
/**
*自定义SQL
* @param sql update table set name ='test' where id =#{et.param}
* @param param 参数列表 param.put("param","1");
* @return update table set name ='test' where id = '1'
*/
boolean execute(String sql, Map param);
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/IMetaRelationshipService.java
浏览文件 @ 739701e4
......@@ -23,26 +23,26 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* 实体[MetaRelationship] 服务对象接口
*/
public interface IMetaRelationshipService extends IService<MetaRelationship>{
boolean create(MetaRelationship et) ;
void createBatch(List<MetaRelationship> list) ;
boolean update(MetaRelationship et) ;
void updateBatch(List<MetaRelationship> list) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
MetaRelationship get(String key) ;
MetaRelationship getDraft(MetaRelationship et) ;
boolean checkKey(MetaRelationship et) ;
boolean save(MetaRelationship et) ;
void saveBatch(List<MetaRelationship> list) ;
Page<MetaRelationship> searchDefault(MetaRelationshipSearchContext context) ;
public interface IMetaRelationshipService extends IService<MetaRelationship> {
boolean create(MetaRelationship et);
void createBatch(List<MetaRelationship> list);
boolean update(MetaRelationship et);
void updateBatch(List<MetaRelationship> list);
boolean remove(String key);
void removeBatch(Collection<String> idList);
MetaRelationship get(String key);
MetaRelationship getDraft(MetaRelationship et);
boolean checkKey(MetaRelationship et);
boolean save(MetaRelationship et);
void saveBatch(List<MetaRelationship> list);
Page<MetaRelationship> searchDefault(MetaRelationshipSearchContext context);
List<MetaRelationship> selectByEntityId(String entity_id);
void removeByEntityId(String entity_id);
void saveByEntityId(String entity_id,List<MetaRelationship> list) ;
void saveByEntityId(String entity_id, List<MetaRelationship> list) ;
List<MetaRelationship> selectByRefEntityId(String entity_id);
void removeByRefEntityId(String entity_id);
void saveByRefEntityId(String entity_id,List<MetaRelationship> list) ;
void saveByRefEntityId(String entity_id, List<MetaRelationship> list) ;
/**
*自定义查询SQL
* @param sql select * from table where id =#{et.param}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstComponentServiceImpl.java
浏览文件 @ 739701e4
......@@ -64,7 +64,7 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -79,10 +79,10 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
@Transactional
public boolean update(DstComponent et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("cid",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("cid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -90,13 +90,13 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
@Transactional
public void updateBatch(List<DstComponent> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -110,11 +110,11 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
@Transactional
public DstComponent get(String key) {
DstComponent et = getById(key);
if(et==null){
et=new DstComponent();
if(et == null){
et = new DstComponent();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -127,7 +127,7 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
@Override
public boolean checkKey(DstComponent et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstConfigServiceImpl.java
浏览文件 @ 739701e4
......@@ -60,7 +60,7 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getCfgId()),et);
CachedBeanCopier.copy(get(et.getCfgId()), et);
return true;
}
......@@ -73,23 +73,23 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
@Override
@Transactional
public boolean update(DstConfig et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("cfgid",et.getCfgId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("cfgid", et.getCfgId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getCfgId()),et);
CachedBeanCopier.copy(get(et.getCfgId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<DstConfig> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -103,11 +103,11 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
@Transactional
public DstConfig get(String key) {
DstConfig et = getById(key);
if(et==null){
et=new DstConfig();
if(et == null){
et = new DstConfig();
et.setCfgId(key);
}
else{
else {
}
return et;
}
......@@ -119,7 +119,7 @@ public class DstConfigServiceImpl extends ServiceImpl<DstConfigMapper, DstConfig
@Override
public boolean checkKey(DstConfig et) {
return (!ObjectUtils.isEmpty(et.getCfgId()))&&(!Objects.isNull(this.getById(et.getCfgId())));
return (!ObjectUtils.isEmpty(et.getCfgId())) && (!Objects.isNull(this.getById(et.getCfgId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
浏览文件 @ 739701e4
......@@ -60,36 +60,36 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getDsId()),et);
CachedBeanCopier.copy(get(et.getDsId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<DstDataSource> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(DstDataSource et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("dsid",et.getDsId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("dsid", et.getDsId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getDsId()),et);
CachedBeanCopier.copy(get(et.getDsId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<DstDataSource> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -103,11 +103,11 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
@Transactional
public DstDataSource get(String key) {
DstDataSource et = getById(key);
if(et==null){
et=new DstDataSource();
if(et == null){
et = new DstDataSource();
et.setDsId(key);
}
else{
else {
}
return et;
}
......@@ -119,7 +119,7 @@ public class DstDataSourceServiceImpl extends ServiceImpl<DstDataSourceMapper, D
@Override
public boolean checkKey(DstDataSource et) {
return (!ObjectUtils.isEmpty(et.getDsId()))&&(!Objects.isNull(this.getById(et.getDsId())));
return (!ObjectUtils.isEmpty(et.getDsId())) && (!Objects.isNull(this.getById(et.getDsId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstMicroserviceServiceImpl.java
浏览文件 @ 739701e4
......@@ -100,14 +100,14 @@ public class DstMicroserviceServiceImpl implements IDstMicroserviceService {
@Override
public List<DstMicroservice> selectByPssystemid(String pssystemid) {
public List<DstMicroservice> selectBySystemid(String pssystemid) {
return null;
}
@Override
public void removeByPssystemid(String pssystemid) {
public void removeBySystemid(String pssystemid) {
Set<String> delIds=new HashSet<String>();
for(DstMicroservice before:selectByPssystemid(pssystemid)){
for(DstMicroservice before:selectBySystemid(pssystemid)){
delIds.add(before.getId());
}
if(delIds.size()>0)
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstRouterServiceImpl.java
浏览文件 @ 739701e4
......@@ -62,7 +62,7 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -75,23 +75,23 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
@Override
@Transactional
public boolean update(DstRouter et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("routerid",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("routerid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<DstRouter> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -105,11 +105,11 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
@Transactional
public DstRouter get(String key) {
DstRouter et = getById(key);
if(et==null){
et=new DstRouter();
if(et == null){
et = new DstRouter();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -121,7 +121,7 @@ public class DstRouterServiceImpl extends ServiceImpl<DstRouterMapper, DstRouter
@Override
public boolean checkKey(DstRouter et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
浏览文件 @ 739701e4
......@@ -63,6 +63,9 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IMetaModuleService metamoduleService;
protected int batchSize = 500;
......@@ -72,36 +75,36 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getPssystemid()),et);
CachedBeanCopier.copy(get(et.getPssystemid()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<DstSystem> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(DstSystem et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("pssystemid",et.getPssystemid()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("pssystemid", et.getPssystemid()))) {
return false;
}
CachedBeanCopier.copy(get(et.getPssystemid()),et);
CachedBeanCopier.copy(get(et.getPssystemid()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<DstSystem> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -115,11 +118,11 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
@Transactional
public DstSystem get(String key) {
DstSystem et = getById(key);
if(et==null){
et=new DstSystem();
if(et == null){
et = new DstSystem();
et.setPssystemid(key);
}
else{
else {
}
return et;
}
......@@ -131,7 +134,7 @@ public class DstSystemServiceImpl extends ServiceImpl<DstSystemMapper, DstSystem
@Override
public boolean checkKey(DstSystem et) {
return (!ObjectUtils.isEmpty(et.getPssystemid()))&&(!Objects.isNull(this.getById(et.getPssystemid())));
return (!ObjectUtils.isEmpty(et.getPssystemid())) && (!Objects.isNull(this.getById(et.getPssystemid())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstViewServiceImpl.java
浏览文件 @ 739701e4
......@@ -64,7 +64,7 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -79,10 +79,10 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
@Transactional
public boolean update(DstView et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("viewid",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("viewid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -90,13 +90,13 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
@Transactional
public void updateBatch(List<DstView> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -110,11 +110,11 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
@Transactional
public DstView get(String key) {
DstView et = getById(key);
if(et==null){
et=new DstView();
if(et == null){
et = new DstView();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -127,7 +127,7 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
@Override
public boolean checkKey(DstView et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java
浏览文件 @ 739701e4
......@@ -61,7 +61,7 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getDatasetId()),et);
CachedBeanCopier.copy(get(et.getDatasetId()), et);
return true;
}
......@@ -76,10 +76,10 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
@Transactional
public boolean update(MetaDataSet et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("datasetid",et.getDatasetId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("datasetid", et.getDatasetId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getDatasetId()),et);
CachedBeanCopier.copy(get(et.getDatasetId()), et);
return true;
}
......@@ -87,13 +87,13 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
@Transactional
public void updateBatch(List<MetaDataSet> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -107,11 +107,11 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
@Transactional
public MetaDataSet get(String key) {
MetaDataSet et = getById(key);
if(et==null){
et=new MetaDataSet();
if(et == null){
et = new MetaDataSet();
et.setDatasetId(key);
}
else{
else {
}
return et;
}
......@@ -124,7 +124,7 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
@Override
public boolean checkKey(MetaDataSet et) {
return (!ObjectUtils.isEmpty(et.getDatasetId()))&&(!Objects.isNull(this.getById(et.getDatasetId())));
return (!ObjectUtils.isEmpty(et.getDatasetId())) && (!Objects.isNull(this.getById(et.getDatasetId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
浏览文件 @ 739701e4
......@@ -69,6 +69,9 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IDstSystemService dstsystemService;
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IMetaModuleService metamoduleService;
protected int batchSize = 500;
......@@ -79,11 +82,11 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
metadatasetService.saveByEntityId(et.getEntityId(),et.getDataSets());
metafieldService.saveByEntityId(et.getEntityId(),et.getFields());
metarelationshipService.saveByEntityId(et.getEntityId(),et.getParentEntitys());
metarelationshipService.saveByRefEntityId(et.getEntityId(),et.getSubEntitys());
CachedBeanCopier.copy(get(et.getEntityId()),et);
metadatasetService.saveByEntityId(et.getEntityId(), et.getDataSets());
metafieldService.saveByEntityId(et.getEntityId(), et.getFields());
metarelationshipService.saveByEntityId(et.getEntityId(), et.getParentEntitys());
metarelationshipService.saveByRefEntityId(et.getEntityId(), et.getSubEntitys());
CachedBeanCopier.copy(get(et.getEntityId()), et);
return true;
}
......@@ -98,14 +101,14 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
@Transactional
public boolean update(MetaEntity et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("entityid",et.getEntityId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("entityid", et.getEntityId()))) {
return false;
}
metadatasetService.saveByEntityId(et.getEntityId(),et.getDataSets());
metafieldService.saveByEntityId(et.getEntityId(),et.getFields());
metarelationshipService.saveByEntityId(et.getEntityId(),et.getParentEntitys());
metarelationshipService.saveByRefEntityId(et.getEntityId(),et.getSubEntitys());
CachedBeanCopier.copy(get(et.getEntityId()),et);
metadatasetService.saveByEntityId(et.getEntityId(), et.getDataSets());
metafieldService.saveByEntityId(et.getEntityId(), et.getFields());
metarelationshipService.saveByEntityId(et.getEntityId(), et.getParentEntitys());
metarelationshipService.saveByRefEntityId(et.getEntityId(), et.getSubEntitys());
CachedBeanCopier.copy(get(et.getEntityId()), et);
return true;
}
......@@ -113,7 +116,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
@Transactional
public void updateBatch(List<MetaEntity> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
......@@ -123,7 +126,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
metafieldService.removeByEntityId(key) ;
metarelationshipService.removeByEntityId(key) ;
metarelationshipService.removeByRefEntityId(key) ;
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -137,11 +140,11 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
@Transactional
public MetaEntity get(String key) {
MetaEntity et = getById(key);
if(et==null){
et=new MetaEntity();
if(et == null){
et = new MetaEntity();
et.setEntityId(key);
}
else{
else {
et.setDataSets(metadatasetService.selectByEntityId(key));
et.setFields(metafieldService.selectByEntityId(key));
et.setParentEntitys(metarelationshipService.selectByEntityId(key));
......@@ -158,7 +161,7 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
@Override
public boolean checkKey(MetaEntity et) {
return (!ObjectUtils.isEmpty(et.getEntityId()))&&(!Objects.isNull(this.getById(et.getEntityId())));
return (!ObjectUtils.isEmpty(et.getEntityId())) && (!Objects.isNull(this.getById(et.getEntityId())));
}
@Override
@Transactional
......@@ -213,6 +216,15 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
this.remove(new QueryWrapper<MetaEntity>().eq("systemid",pssystemid));
}
@Override
public List<MetaEntity> selectByModuleId(String id) {
return baseMapper.selectByModuleId(id);
}
@Override
public void removeByModuleId(String id) {
this.remove(new QueryWrapper<MetaEntity>().eq("moduleid",id));
}
/**
* 查询集合 数据集
......@@ -250,6 +262,16 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
}
et.setSystemName(system.getPssystemname());
}
//实体关系[DER1N_META_ENTITY_META_MODULE_MODULEID]
if(!ObjectUtils.isEmpty(et.getModuleId())){
cn.ibizlab.core.lite.domain.MetaModule module=et.getModule();
if(ObjectUtils.isEmpty(module)){
cn.ibizlab.core.lite.domain.MetaModule majorEntity=metamoduleService.get(et.getModuleId());
et.setModule(majorEntity);
module=majorEntity;
}
et.setModuleName(module.getName());
}
}
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
浏览文件 @ 739701e4
......@@ -66,7 +66,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getFieldId()),et);
CachedBeanCopier.copy(get(et.getFieldId()), et);
return true;
}
......@@ -81,10 +81,10 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
@Transactional
public boolean update(MetaField et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("fieldid",et.getFieldId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("fieldid", et.getFieldId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getFieldId()),et);
CachedBeanCopier.copy(get(et.getFieldId()), et);
return true;
}
......@@ -92,13 +92,13 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
@Transactional
public void updateBatch(List<MetaField> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -112,11 +112,11 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
@Transactional
public MetaField get(String key) {
MetaField et = getById(key);
if(et==null){
et=new MetaField();
if(et == null){
et = new MetaField();
et.setFieldId(key);
}
else{
else {
}
return et;
}
......@@ -129,7 +129,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
@Override
public boolean checkKey(MetaField et) {
return (!ObjectUtils.isEmpty(et.getFieldId()))&&(!Objects.isNull(this.getById(et.getFieldId())));
return (!ObjectUtils.isEmpty(et.getFieldId())) && (!Objects.isNull(this.getById(et.getFieldId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
浏览文件 @ 739701e4
......@@ -57,36 +57,36 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void createBatch(List<MetaModel> list) {
this.saveBatch(list,batchSize);
this.saveBatch(list, batchSize);
}
@Override
@Transactional
public boolean update(MetaModel et) {
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("modelid",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("modelid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
@Override
@Transactional
public void updateBatch(List<MetaModel> list) {
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -100,11 +100,11 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
@Transactional
public MetaModel get(String key) {
MetaModel et = getById(key);
if(et==null){
et=new MetaModel();
if(et == null){
et = new MetaModel();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -123,7 +123,7 @@ public class MetaModelServiceImpl extends ServiceImpl<MetaModelMapper, MetaModel
@Override
public boolean checkKey(MetaModel et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModuleServiceImpl.java
浏览文件 @ 739701e4
......@@ -33,44 +33,85 @@ import cn.ibizlab.util.helper.CachedBeanCopier;
import cn.ibizlab.util.helper.DEFieldCacheMap;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.ibizlab.core.lite.mapper.MetaModuleMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.StringUtils;
/**
* 实体[模块] 无存储服务对象接口实现
* 实体[模块] 服务对象接口实现
*/
@Slf4j
@Service
public class MetaModuleServiceImpl implements IMetaModuleService {
@Service("MetaModuleServiceImpl")
public class MetaModuleServiceImpl extends ServiceImpl<MetaModuleMapper, MetaModule> implements IMetaModuleService {
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IMetaEntityService metaentityService;
@Autowired
@Lazy
protected cn.ibizlab.core.lite.service.IDstSystemService dstsystemService;
protected int batchSize = 500;
@Override
@Transactional
public boolean create(MetaModule et) {
//代码实现
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
public void createBatch(List<MetaModule> list){
@Override
@Transactional
public void createBatch(List<MetaModule> list) {
this.saveOrUpdateBatch(list,batchSize);
}
@Override
@Transactional
public boolean update(MetaModule et) {
//代码实现
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("moduleid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
public void updateBatch(List<MetaModule> list){
@Override
@Transactional
public void updateBatch(List<MetaModule> list) {
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
return true;
boolean result = removeById(key);
return result ;
}
public void removeBatch(Collection<String> idList){
@Override
@Transactional
public void removeBatch(Collection<String> idList) {
removeByIds(idList);
}
@Override
@Transactional
public MetaModule get(String key) {
MetaModule et = new MetaModule();
MetaModule et = getById(key);
if(et == null){
et = new MetaModule();
et.setId(key);
}
else {
}
return et;
}
......@@ -81,47 +122,95 @@ public class MetaModuleServiceImpl implements IMetaModuleService {
@Override
public boolean checkKey(MetaModule et) {
return false;
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
public boolean save(MetaModule et) {
//代码实现
if(!saveOrUpdate(et)) {
return false;
}
return true;
}
@Override
public void saveBatch(List<MetaModule> list) {
@Transactional
public boolean saveOrUpdate(MetaModule et) {
if (null == et) {
return false;
} else {
return checkKey(et) ? this.update(et) : this.create(et);
}
}
@Override
@Transactional
public boolean saveBatch(Collection<MetaModule> list) {
saveOrUpdateBatch(list,batchSize);
return true;
}
@Override
public List<MetaModule> selectBySystemid(String pssystemid) {
return null;
@Transactional
public void saveBatch(List<MetaModule> list) {
saveOrUpdateBatch(list,batchSize);
}
@Override
public void removeBySystemid(String pssystemid) {
Set<String> delIds=new HashSet<String>();
for(MetaModule before:selectBySystemid(pssystemid)){
delIds.add(before.getId());
public List<MetaModule> selectBySystemId(String pssystemid) {
return baseMapper.selectBySystemId(pssystemid);
}
if(delIds.size()>0)
this.removeBatch(delIds);
@Override
public void removeBySystemId(String pssystemid) {
this.remove(new QueryWrapper<MetaModule>().eq("systemid",pssystemid));
}
/**
* 查询集合 数据集
*/
@Override
public Page<MetaModule> searchDefault(MetaModuleSearchContext context) {
return new PageImpl<MetaModule>(new ArrayList(),context.getPageable(),0);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<MetaModule> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
return new PageImpl<MetaModule>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
@Override
public List<JSONObject> select(String sql, Map param){
return this.baseMapper.selectBySQL(sql,param);
}
@Override
@Transactional
public boolean execute(String sql , Map param){
if (sql == null || sql.isEmpty()) {
return false;
}
if (sql.toLowerCase().trim().startsWith("insert")) {
return this.baseMapper.insertBySQL(sql,param);
}
if (sql.toLowerCase().trim().startsWith("update")) {
return this.baseMapper.updateBySQL(sql,param);
}
if (sql.toLowerCase().trim().startsWith("delete")) {
return this.baseMapper.deleteBySQL(sql,param);
}
log.warn("暂未支持的SQL语法");
return true;
}
}
ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java
浏览文件 @ 739701e4
......@@ -64,7 +64,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
if(!this.retBool(this.baseMapper.insert(et))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -79,10 +79,10 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
@Transactional
public boolean update(MetaRelationship et) {
fillParentData(et);
if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("relationid",et.getId()))) {
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("relationid", et.getId()))) {
return false;
}
CachedBeanCopier.copy(get(et.getId()),et);
CachedBeanCopier.copy(get(et.getId()), et);
return true;
}
......@@ -90,13 +90,13 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
@Transactional
public void updateBatch(List<MetaRelationship> list) {
list.forEach(item->fillParentData(item));
updateBatchById(list,batchSize);
updateBatchById(list, batchSize);
}
@Override
@Transactional
public boolean remove(String key) {
boolean result=removeById(key);
boolean result = removeById(key);
return result ;
}
......@@ -110,11 +110,11 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
@Transactional
public MetaRelationship get(String key) {
MetaRelationship et = getById(key);
if(et==null){
et=new MetaRelationship();
if(et == null){
et = new MetaRelationship();
et.setId(key);
}
else{
else {
}
return et;
}
......@@ -127,7 +127,7 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
@Override
public boolean checkKey(MetaRelationship et) {
return (!ObjectUtils.isEmpty(et.getId()))&&(!Objects.isNull(this.getById(et.getId())));
return (!ObjectUtils.isEmpty(et.getId())) && (!Objects.isNull(this.getById(et.getId())));
}
@Override
@Transactional
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 739701e4
......@@ -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"/>
......@@ -150,7 +150,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"/>
......@@ -174,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"/>
......@@ -194,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"/>
......@@ -216,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"/>
......@@ -238,7 +238,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-79-12">
<changeSet author="root" id="tab-meta_entity-87-12">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -255,12 +255,18 @@
</column>
<column name="DSID" remarks="" type="VARCHAR(100)">
</column>
<column name="MODULEID" remarks="" type="VARCHAR(100)">
</column>
<column name="EXTPARAMS" remarks="" type="TEXT(1048576)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[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 +326,7 @@
<!--输出实体[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"/>
......@@ -335,10 +341,26 @@
</changeSet>
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="root" id="tab-meta_module-27-15">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
</column>
<column name="MODULENAME" remarks="" type="VARCHAR(100)">
</column>
<column name="CODENAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-90-15">
<changeSet author="root" id="tab-meta_relation-90-16">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -376,8 +398,12 @@
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_ENTITY]外键关系 -->
<changeSet author="root" id="fk-meta_entity-87-17">
<addForeignKeyConstraint baseColumnNames="MODULEID" baseTableName="IBZENTITY" constraintName="DER1N_META_ENTITY_META_MODULE_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="MODULEID" referencedTableName="IBZMODULE" validate="true"/>
</changeSet>
<!--输出实体[META_FIELD]外键关系 -->
<!--输出实体[META_MODEL]外键关系 -->
<!--输出实体[META_MODULE]外键关系 -->
<!--输出实体[META_RELATION]外键关系 -->
</databaseChangeLog>
ibzlite-core/src/main/resources/mapper/lite/metaentity/MetaEntityMapper.xml
浏览文件 @ 739701e4
......@@ -8,7 +8,7 @@
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`DSID`, t21.`DSNAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOGICNAME`, t1.`SYSTEMID`, t11.`PSSYSTEMNAME` AS `SYSTEMNAME`, t1.`TABLENAME` FROM `IBZENTITY` t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID ) t1 where entityid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaEntityResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOGICNAME, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID ) t1 where entityid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXTPARAMS, t1.LOGICNAME, t1.MODULEID, t31.MODULENAME, t1.SHOWORDER, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID LEFT JOIN IBZMODULE t31 ON t1.MODULEID = t31.MODULEID ) t1 where entityid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaEntityResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOGICNAME, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID ) t1 where entityid=#{id}]]>
......@@ -19,12 +19,15 @@
<id property="entityId" column="entityid" /><!--主键字段映射-->
<result property="systemId" column="systemid" />
<result property="dsId" column="dsid" />
<result property="moduleId" column="moduleid" />
<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
<association property="dataSource" javaType="cn.ibizlab.core.lite.domain.DstDataSource" column="dsid" select="cn.ibizlab.core.lite.mapper.DstDataSourceMapper.selectById" fetchType="lazy"></association>
<!--通过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="module" javaType="cn.ibizlab.core.lite.domain.MetaModule" column="moduleid" select="cn.ibizlab.core.lite.mapper.MetaModuleMapper.selectById" fetchType="lazy"></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_ENTITY_DST_DATASOURCE_DSID] -->
......@@ -40,6 +43,13 @@
<include refid="Default" />
) t1
where systemid=#{pssystemid}
</select>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_ENTITY_META_MODULE_MODULEID] -->
<select id="selectByModuleId" resultMap="MetaEntityResultMap">
select t1.* from (
<include refid="Default" />
) t1
where moduleid=#{id}
</select>
<!--数据集合[Default]-->
......@@ -58,7 +68,7 @@
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOGICNAME, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID
<![CDATA[ SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOGICNAME, t1.MODULEID, t31.MODULENAME, t1.SHOWORDER, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID LEFT JOIN IBZMODULE t31 ON t1.MODULEID = t31.MODULEID
]]>
</sql>
<!--数据查询[Default]-->
......@@ -73,7 +83,7 @@
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.LOGICNAME, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID
<![CDATA[ SELECT t1.CODENAME, t1.DSID, t21.DSNAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXTPARAMS, t1.LOGICNAME, t1.MODULEID, t31.MODULENAME, t1.SHOWORDER, t1.SYSTEMID, t11.PSSYSTEMNAME AS SYSTEMNAME, t1.TABLENAME FROM IBZENTITY t1 LEFT JOIN IBZPSSYSTEM t11 ON t1.SYSTEMID = t11.PSSYSTEMID LEFT JOIN IBZDATASOURCE t21 ON t1.DSID = t21.DSID LEFT JOIN IBZMODULE t31 ON t1.MODULEID = t31.MODULEID
]]>
</sql>
<!--数据查询[View]-->
......
ibzlite-core/src/main/resources/mapper/lite/metamodule/MetaModuleMapper.xml 0 → 100644
浏览文件 @ 739701e4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.lite.mapper.MetaModuleMapper">
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="MetaModuleResultMap" databaseId="mysql">
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`MODULEID`, t1.`MODULENAME`, t1.`SYSTEMID` FROM `IBZMODULE` t1 ) t1 where moduleid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaModuleResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SHOWORDER, t1.SYSTEMID FROM IBZMODULE t1 ) t1 where moduleid=#{id}]]>
</select>
<select id="selectById" resultMap="MetaModuleResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SYSTEMID FROM IBZMODULE t1 ) t1 where moduleid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="MetaModuleResultMap" type="cn.ibizlab.core.lite.domain.MetaModule" autoMapping="true">
<id property="id" column="moduleid" /><!--主键字段映射-->
<result property="name" column="modulename" />
<result property="systemId" column="systemid" />
<!--通过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>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_META_MODULE_DST_SYSTEM_SYSTEMID] -->
<select id="selectBySystemId" resultMap="MetaModuleResultMap">
select t1.* from (
<include refid="Default" />
) t1
where systemid=#{pssystemid}
</select>
<!--数据集合[Default]-->
<select id="searchDefault" parameterType="cn.ibizlab.core.lite.filter.MetaModuleSearchContext" resultMap="MetaModuleResultMap">
select t1.* from (
<include refid="Default" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CODENAME`, t1.`MODULEID`, t1.`MODULENAME`, t1.`SYSTEMID` FROM `IBZMODULE` t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SHOWORDER, t1.SYSTEMID FROM IBZMODULE t1
]]>
</sql>
<!--数据查询[Default]-->
<sql id="Default" databaseId="postgresql">
<![CDATA[ SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SYSTEMID FROM IBZMODULE t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="mysql">
<![CDATA[ SELECT t1.`CODENAME`, t1.`MODULEID`, t1.`MODULENAME`, t1.`SYSTEMID` FROM `IBZMODULE` t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SHOWORDER, t1.SYSTEMID FROM IBZMODULE t1
]]>
</sql>
<!--数据查询[View]-->
<sql id="View" databaseId="postgresql">
<![CDATA[ SELECT t1.CODENAME, t1.MODULEID, t1.MODULENAME, t1.SYSTEMID FROM IBZMODULE t1
]]>
</sql>
</mapper>
ibzlite-core/src/main/resources/sysmodel/ibzlite.json
浏览文件 @ 739701e4
......@@ -1129,7 +1129,7 @@
},
{
"fieldname":"SYSTEMID" ,
"codename":"PSSystemId",
"codename":"SystemId",
"field_logic_name":"系统标识",
"entity_name":"DstMicroservice",
"ref_de":"DST_SYSTEM",
......@@ -1940,6 +1940,69 @@
"key_field":0,
"show_order":9,
"major_field":0
},
{
"fieldname":"MODULEID" ,
"codename":"Module_id",
"field_logic_name":"模块标识",
"entity_name":"MetaEntity",
"ref_de":"META_MODULE",
"ref_field_name":"MODULEID",
"relation_name":"DER1N_META_ENTITY_META_MODULE_MODULEID",
"relation_codename":"Module",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":11,
"major_field":0
},
{
"fieldname":"MODULENAME" ,
"codename":"Module_name",
"field_logic_name":"模块",
"entity_name":"MetaEntity",
"ref_de":"META_MODULE",
"ref_field_name":"MODULENAME",
"relation_name":"DER1N_META_ENTITY_META_MODULE_MODULEID",
"relation_codename":"Module",
"field_type":"PICKUPTEXT",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":12,
"major_field":0
},
{
"fieldname":"EXTPARAMS" ,
"codename":"Ext_params",
"field_logic_name":"扩展参数",
"entity_name":"MetaEntity",
"field_type":"LONGTEXT",
"nullable":1,
"physical_field":1,
"data_type":"TEXT",
"data_length":1048576,
"key_field":0,
"show_order":20,
"major_field":0
},
{
"fieldname":"SHOWORDER" ,
"codename":"Show_order",
"field_logic_name":"排序",
"entity_name":"MetaEntity",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":49,
"major_field":0
}
],
"subEntitys":[
......@@ -1992,6 +2055,12 @@
"code_name":"System",
"entity_name":"META_ENTITY",
"ref_entity_name":"DST_SYSTEM"
},
{"name":"DER1N_META_ENTITY_META_MODULE_MODULEID",
"relation_type":"DER1N",
"code_name":"Module",
"entity_name":"META_ENTITY",
"ref_entity_name":"META_MODULE"
}
]
}
......@@ -2700,7 +2769,7 @@
},
{
"fieldname":"CODENAME" ,
"codename":"CodeName",
"codename":"Code_name",
"field_logic_name":"代码名称",
"entity_name":"MetaModule",
"field_type":"TEXT",
......@@ -2715,7 +2784,7 @@
},
{
"fieldname":"SYSTEMID" ,
"codename":"SystemId",
"codename":"System_id",
"field_logic_name":"系统标识",
"entity_name":"MetaModule",
"ref_de":"DST_SYSTEM",
......@@ -2731,9 +2800,28 @@
"union_key":"KEY1",
"show_order":4,
"major_field":0
},
{
"fieldname":"SHOWORDER" ,
"codename":"Show_order",
"field_logic_name":"排序",
"entity_name":"MetaModule",
"field_type":"INT",
"nullable":1,
"physical_field":1,
"data_type":"INT",
"key_field":0,
"show_order":49,
"major_field":0
}
],
"subEntitys":[
{"name":"DER1N_META_ENTITY_META_MODULE_MODULEID",
"relation_type":"DER1N",
"code_name":"Module",
"entity_name":"META_ENTITY",
"ref_entity_name":"META_MODULE"
}
],
"parentEntitys":[
{"name":"DER1N_META_MODULE_DST_SYSTEM_SYSTEMID",
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/DstMicroserviceDTO.java
浏览文件 @ 739701e4
......@@ -60,10 +60,10 @@ public class DstMicroserviceDTO extends DTOBase implements Serializable {
* 属性 [SYSTEMID]
*
*/
@JSONField(name = "pssystemid")
@JsonProperty("pssystemid")
@JSONField(name = "systemid")
@JsonProperty("systemid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String pssystemid;
private String systemid;
/**
* 属性 [ADDR]
......@@ -94,9 +94,9 @@ public class DstMicroserviceDTO extends DTOBase implements Serializable {
/**
* 设置 [SYSTEMID]
*/
public void setPssystemid(String pssystemid){
this.pssystemid = pssystemid ;
this.modify("systemid",pssystemid);
public void setSystemid(String systemid){
this.systemid = systemid ;
this.modify("systemid",systemid);
}
/**
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaEntityDTO.java
浏览文件 @ 739701e4
......@@ -110,6 +110,41 @@ public class MetaEntityDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String dsName;
/**
* 属性 [MODULEID]
*
*/
@JSONField(name = "module_id")
@JsonProperty("module_id")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String moduleId;
/**
* 属性 [MODULENAME]
*
*/
@JSONField(name = "module_name")
@JsonProperty("module_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String moduleName;
/**
* 属性 [EXTPARAMS]
*
*/
@JSONField(name = "ext_params")
@JsonProperty("ext_params")
@Size(min = 0, max = 1048576, message = "内容长度必须小于等于[1048576]")
private String extParams;
/**
* 属性 [SHOWORDER]
*
*/
@JSONField(name = "show_order")
@JsonProperty("show_order")
private Integer showOrder;
/**
* 设置 [ENTITYNAME]
......@@ -159,6 +194,30 @@ public class MetaEntityDTO extends DTOBase implements Serializable {
this.modify("dsid",dsId);
}
/**
* 设置 [MODULEID]
*/
public void setModuleId(String moduleId){
this.moduleId = moduleId ;
this.modify("moduleid",moduleId);
}
/**
* 设置 [EXTPARAMS]
*/
public void setExtParams(String extParams){
this.extParams = extParams ;
this.modify("extparams",extParams);
}
/**
* 设置 [SHOWORDER]
*/
public void setShowOrder(Integer showOrder){
this.showOrder = showOrder ;
this.modify("showorder",showOrder);
}
}
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaModuleDTO.java
浏览文件 @ 739701e4
......@@ -51,19 +51,27 @@ public class MetaModuleDTO extends DTOBase implements Serializable {
* 属性 [CODENAME]
*
*/
@JSONField(name = "codename")
@JsonProperty("codename")
@JSONField(name = "code_name")
@JsonProperty("code_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String codename;
private String codeName;
/**
* 属性 [SYSTEMID]
*
*/
@JSONField(name = "systemid")
@JsonProperty("systemid")
@JSONField(name = "system_id")
@JsonProperty("system_id")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String systemid;
private String systemId;
/**
* 属性 [SHOWORDER]
*
*/
@JSONField(name = "show_order")
@JsonProperty("show_order")
private Integer showOrder;
/**
......@@ -77,17 +85,25 @@ public class MetaModuleDTO extends DTOBase implements Serializable {
/**
* 设置 [CODENAME]
*/
public void setCodename(String codename){
this.codename = codename ;
this.modify("codename",codename);
public void setCodeName(String codeName){
this.codeName = codeName ;
this.modify("codename",codeName);
}
/**
* 设置 [SYSTEMID]
*/
public void setSystemid(String systemid){
this.systemid = systemid ;
this.modify("systemid",systemid);
public void setSystemId(String systemId){
this.systemId = systemId ;
this.modify("systemid",systemId);
}
/**
* 设置 [SHOWORDER]
*/
public void setShowOrder(Integer showOrder){
this.showOrder = showOrder ;
this.modify("showorder",showOrder);
}
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/BladeVisualCategoryMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.avuedata.domain.BladeVisualCategory;
import cn.ibizlab.api.dto.BladeVisualCategoryDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiBladeVisualCategoryMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiBladeVisualCategoryMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface BladeVisualCategoryMapping extends MappingBase<BladeVisualCategoryDTO, BladeVisualCategory> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/BladeVisualConfigMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.avuedata.domain.BladeVisualConfig;
import cn.ibizlab.api.dto.BladeVisualConfigDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiBladeVisualConfigMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiBladeVisualConfigMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface BladeVisualConfigMapping extends MappingBase<BladeVisualConfigDTO, BladeVisualConfig> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/BladeVisualMapMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.avuedata.domain.BladeVisualMap;
import cn.ibizlab.api.dto.BladeVisualMapDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiBladeVisualMapMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiBladeVisualMapMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface BladeVisualMapMapping extends MappingBase<BladeVisualMapDTO, BladeVisualMap> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/BladeVisualMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.avuedata.domain.BladeVisual;
import cn.ibizlab.api.dto.BladeVisualDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiBladeVisualMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiBladeVisualMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface BladeVisualMapping extends MappingBase<BladeVisualDTO, BladeVisual> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstAPIMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstAPI;
import cn.ibizlab.api.dto.DstAPIDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstAPIMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstAPIMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstAPIMapping extends MappingBase<DstAPIDTO, DstAPI> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstAppMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstApp;
import cn.ibizlab.api.dto.DstAppDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstAppMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstAppMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstAppMapping extends MappingBase<DstAppDTO, DstApp> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstComponentMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstComponent;
import cn.ibizlab.api.dto.DstComponentDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstComponentMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstComponentMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstComponentMapping extends MappingBase<DstComponentDTO, DstComponent> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstConfigMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstConfig;
import cn.ibizlab.api.dto.DstConfigDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstConfigMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstConfigMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstConfigMapping extends MappingBase<DstConfigDTO, DstConfig> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstDataSourceMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstDataSource;
import cn.ibizlab.api.dto.DstDataSourceDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstDataSourceMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstDataSourceMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstDataSourceMapping extends MappingBase<DstDataSourceDTO, DstDataSource> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstMicroserviceMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstMicroservice;
import cn.ibizlab.api.dto.DstMicroserviceDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstMicroserviceMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstMicroserviceMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstMicroserviceMapping extends MappingBase<DstMicroserviceDTO, DstMicroservice> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstRouterMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstRouter;
import cn.ibizlab.api.dto.DstRouterDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstRouterMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstRouterMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstRouterMapping extends MappingBase<DstRouterDTO, DstRouter> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstSystemMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstSystem;
import cn.ibizlab.api.dto.DstSystemDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstSystemMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstSystemMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstSystemMapping extends MappingBase<DstSystemDTO, DstSystem> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/DstViewMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.DstView;
import cn.ibizlab.api.dto.DstViewDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiDstViewMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiDstViewMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface DstViewMapping extends MappingBase<DstViewDTO, DstView> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaDataSetMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaDataSet;
import cn.ibizlab.api.dto.MetaDataSetDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaDataSetMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaDataSetMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaDataSetMapping extends MappingBase<MetaDataSetDTO, MetaDataSet> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaEntityMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaEntity;
import cn.ibizlab.api.dto.MetaEntityDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaEntityMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaEntityMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaEntityMapping extends MappingBase<MetaEntityDTO, MetaEntity> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaFieldMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaField;
import cn.ibizlab.api.dto.MetaFieldDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaFieldMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaFieldMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaFieldMapping extends MappingBase<MetaFieldDTO, MetaField> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaLookupMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ 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",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaLookupMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaLookupMapping extends MappingBase<MetaLookupDTO, MetaLookup> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaModelMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaModel;
import cn.ibizlab.api.dto.MetaModelDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaModelMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaModelMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaModelMapping extends MappingBase<MetaModelDTO, MetaModel> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaModuleMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaModule;
import cn.ibizlab.api.dto.MetaModuleDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaModuleMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaModuleMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaModuleMapping extends MappingBase<MetaModuleDTO, MetaModule> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/mapping/MetaRelationshipMapping.java
浏览文件 @ 739701e4
......@@ -4,9 +4,8 @@ import org.mapstruct.*;
import cn.ibizlab.core.lite.domain.MetaRelationship;
import cn.ibizlab.api.dto.MetaRelationshipDTO;
import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {},implementationName="apiMetaRelationshipMapping",
@Mapper(componentModel = "spring", uses = {}, implementationName = "apiMetaRelationshipMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface MetaRelationshipMapping extends MappingBase<MetaRelationshipDTO, MetaRelationship> {
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/DstMicroserviceResource.java
浏览文件 @ 739701e4
......@@ -151,7 +151,7 @@ public class DstMicroserviceResource {
@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstmicroservices")
public ResponseEntity<DstMicroserviceDTO> createByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstMicroserviceDTO dstmicroservicedto) {
DstMicroservice domain = dstmicroserviceMapping.toDomain(dstmicroservicedto);
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
dstmicroserviceService.create(domain);
DstMicroserviceDTO dto = dstmicroserviceMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
......@@ -162,7 +162,7 @@ public class DstMicroserviceResource {
public ResponseEntity<Boolean> createBatchByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody List<DstMicroserviceDTO> dstmicroservicedtos) {
List<DstMicroservice> domainlist=dstmicroserviceMapping.toDomain(dstmicroservicedtos);
for(DstMicroservice domain:domainlist){
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
}
dstmicroserviceService.createBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -172,7 +172,7 @@ public class DstMicroserviceResource {
@RequestMapping(method = RequestMethod.PUT, value = "/dstsystems/{dstsystem_id}/dstmicroservices/{dstmicroservice_id}")
public ResponseEntity<DstMicroserviceDTO> updateByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @PathVariable("dstmicroservice_id") String dstmicroservice_id, @RequestBody DstMicroserviceDTO dstmicroservicedto) {
DstMicroservice domain = dstmicroserviceMapping.toDomain(dstmicroservicedto);
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
domain.setId(dstmicroservice_id);
dstmicroserviceService.update(domain);
DstMicroserviceDTO dto = dstmicroserviceMapping.toDto(domain);
......@@ -184,7 +184,7 @@ public class DstMicroserviceResource {
public ResponseEntity<Boolean> updateBatchByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody List<DstMicroserviceDTO> dstmicroservicedtos) {
List<DstMicroservice> domainlist=dstmicroserviceMapping.toDomain(dstmicroservicedtos);
for(DstMicroservice domain:domainlist){
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
}
dstmicroserviceService.updateBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true);
......@@ -215,7 +215,7 @@ public class DstMicroserviceResource {
@RequestMapping(method = RequestMethod.GET, value = "/dstsystems/{dstsystem_id}/dstmicroservices/getdraft")
public ResponseEntity<DstMicroserviceDTO> getDraftByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id) {
DstMicroservice domain = new DstMicroservice();
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
return ResponseEntity.status(HttpStatus.OK).body(dstmicroserviceMapping.toDto(dstmicroserviceService.getDraft(domain)));
}
......@@ -229,7 +229,7 @@ public class DstMicroserviceResource {
@RequestMapping(method = RequestMethod.POST, value = "/dstsystems/{dstsystem_id}/dstmicroservices/save")
public ResponseEntity<Boolean> saveByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody DstMicroserviceDTO dstmicroservicedto) {
DstMicroservice domain = dstmicroserviceMapping.toDomain(dstmicroservicedto);
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
return ResponseEntity.status(HttpStatus.OK).body(dstmicroserviceService.save(domain));
}
......@@ -238,7 +238,7 @@ public class DstMicroserviceResource {
public ResponseEntity<Boolean> saveBatchByDstSystem(@PathVariable("dstsystem_id") String dstsystem_id, @RequestBody List<DstMicroserviceDTO> dstmicroservicedtos) {
List<DstMicroservice> domainlist=dstmicroserviceMapping.toDomain(dstmicroservicedtos);
for(DstMicroservice domain:domainlist){
domain.setPssystemid(dstsystem_id);
domain.setSystemid(dstsystem_id);
}
dstmicroserviceService.saveBatch(domainlist);
return ResponseEntity.status(HttpStatus.OK).body(true);
......
ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModuleResource.java
浏览文件 @ 739701e4
......@@ -47,6 +47,7 @@ public class MetaModuleResource {
@Lazy
public MetaModuleMapping metamoduleMapping;
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Create-all')")
@ApiOperation(value = "新建模块", tags = {"模块" }, notes = "新建模块")
@RequestMapping(method = RequestMethod.POST, value = "/metamodules")
public ResponseEntity<MetaModuleDTO> create(@Validated @RequestBody MetaModuleDTO metamoduledto) {
......@@ -56,6 +57,7 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Create-all')")
@ApiOperation(value = "批量新建模块", tags = {"模块" }, notes = "批量新建模块")
@RequestMapping(method = RequestMethod.POST, value = "/metamodules/batch")
public ResponseEntity<Boolean> createBatch(@RequestBody List<MetaModuleDTO> metamoduledtos) {
......@@ -63,6 +65,7 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Update-all')")
@ApiOperation(value = "更新模块", tags = {"模块" }, notes = "更新模块")
@RequestMapping(method = RequestMethod.PUT, value = "/metamodules/{metamodule_id}")
public ResponseEntity<MetaModuleDTO> update(@PathVariable("metamodule_id") String metamodule_id, @RequestBody MetaModuleDTO metamoduledto) {
......@@ -73,6 +76,7 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(dto);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Update-all')")
@ApiOperation(value = "批量更新模块", tags = {"模块" }, notes = "批量更新模块")
@RequestMapping(method = RequestMethod.PUT, value = "/metamodules/batch")
public ResponseEntity<Boolean> updateBatch(@RequestBody List<MetaModuleDTO> metamoduledtos) {
......@@ -80,12 +84,14 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Remove-all')")
@ApiOperation(value = "删除模块", tags = {"模块" }, notes = "删除模块")
@RequestMapping(method = RequestMethod.DELETE, value = "/metamodules/{metamodule_id}")
public ResponseEntity<Boolean> remove(@PathVariable("metamodule_id") String metamodule_id) {
return ResponseEntity.status(HttpStatus.OK).body(metamoduleService.remove(metamodule_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Remove-all')")
@ApiOperation(value = "批量删除模块", tags = {"模块" }, notes = "批量删除模块")
@RequestMapping(method = RequestMethod.DELETE, value = "/metamodules/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
......@@ -93,6 +99,7 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Get-all')")
@ApiOperation(value = "获取模块", tags = {"模块" }, notes = "获取模块")
@RequestMapping(method = RequestMethod.GET, value = "/metamodules/{metamodule_id}")
public ResponseEntity<MetaModuleDTO> get(@PathVariable("metamodule_id") String metamodule_id) {
......@@ -113,12 +120,14 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(metamoduleService.checkKey(metamoduleMapping.toDomain(metamoduledto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Save-all')")
@ApiOperation(value = "保存模块", tags = {"模块" }, notes = "保存模块")
@RequestMapping(method = RequestMethod.POST, value = "/metamodules/save")
public ResponseEntity<Boolean> save(@RequestBody MetaModuleDTO metamoduledto) {
return ResponseEntity.status(HttpStatus.OK).body(metamoduleService.save(metamoduleMapping.toDomain(metamoduledto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-Save-all')")
@ApiOperation(value = "批量保存模块", tags = {"模块" }, notes = "批量保存模块")
@RequestMapping(method = RequestMethod.POST, value = "/metamodules/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<MetaModuleDTO> metamoduledtos) {
......@@ -126,6 +135,7 @@ public class MetaModuleResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-searchDefault-all')")
@ApiOperation(value = "获取数据集", tags = {"模块" } ,notes = "获取数据集")
@RequestMapping(method= RequestMethod.GET , value="/metamodules/fetchdefault")
public ResponseEntity<List<MetaModuleDTO>> fetchDefault(MetaModuleSearchContext context) {
......@@ -138,6 +148,7 @@ public class MetaModuleResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzlite-MetaModule-searchDefault-all')")
@ApiOperation(value = "查询数据集", tags = {"模块" } ,notes = "查询数据集")
@RequestMapping(method= RequestMethod.POST , value="/metamodules/searchdefault")
public ResponseEntity<Page<MetaModuleDTO>> searchDefault(@RequestBody MetaModuleSearchContext context) {
......
ibzlite-util/src/main/java/cn/ibizlab/util/aspect/AuditAspect.java
浏览文件 @ 739701e4
......@@ -43,32 +43,31 @@ public class AuditAspect
*/
@AfterReturning(value = "execution(* cn.ibizlab.core.*.service.*.create(..))")
@SneakyThrows
public void create(JoinPoint point){
HttpServletRequest request=null;
RequestAttributes requestAttributes= RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null){
request=((ServletRequestAttributes)requestAttributes).getRequest();
public void create(JoinPoint point) {
HttpServletRequest request = null;
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null) {
request = ((ServletRequestAttributes)requestAttributes).getRequest();
}
Object [] args = point.getArgs();
if(ObjectUtils.isEmpty(args) || args.length==0) {
return;
}
Object serviceParam =args[0];
if(serviceParam instanceof EntityBase){
EntityBase entity=(EntityBase)serviceParam;
Map<String, Audit> auditFields= DEFieldCacheMap.getAuditFields(entity.getClass());
Object serviceParam = args[0];
if(serviceParam instanceof EntityBase) {
EntityBase entity = (EntityBase)serviceParam;
Map<String, Audit> auditFields = DEFieldCacheMap.getAuditFields(entity.getClass());
//是否有审计属性
if(auditFields.size()==0) {
return;
}
String idField=DEFieldCacheMap.getDEKeyField(entity.getClass());
Object idValue="";
if(!StringUtils.isEmpty(idField)){
String idField = DEFieldCacheMap.getDEKeyField(entity.getClass());
Object idValue = "";
if(!StringUtils.isEmpty(idField)) {
idValue=entity.get(idField);
}
//记录审计日志
dataAuditService.createAudit(request,entity,idValue,auditFields);
dataAuditService.createAudit(request, entity, idValue, auditFields);
}
}
......@@ -79,42 +78,38 @@ public class AuditAspect
*/
@Around("execution(* cn.ibizlab.core.*.service.*.update(..))")
public Object update(ProceedingJoinPoint point) throws Throwable {
HttpServletRequest request=null;
RequestAttributes requestAttributes= RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null){
HttpServletRequest request = null;
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null) {
request=((ServletRequestAttributes)requestAttributes).getRequest();
}
Object serviceObj=point.getTarget();
Object args[]=point.getArgs();
Object serviceObj = point.getTarget();
Object args[] = point.getArgs();
if(ObjectUtils.isEmpty(args) || args.length==0) {
return point.proceed();
}
Object arg=args[0];
if(arg instanceof EntityBase){
EntityBase entity= (EntityBase) arg;
Map<String, Audit> auditFields= DEFieldCacheMap.getAuditFields(entity.getClass());
Object arg = args[0];
if(arg instanceof EntityBase) {
EntityBase entity = (EntityBase) arg;
Map<String, Audit> auditFields = DEFieldCacheMap.getAuditFields(entity.getClass());
//是否有审计属性
if(auditFields.size()==0) {
return point.proceed();
}
String idField=DEFieldCacheMap.getDEKeyField(entity.getClass());
Object idValue="";
String idField = DEFieldCacheMap.getDEKeyField(entity.getClass());
Object idValue = "";
if(!StringUtils.isEmpty(idField)){
idValue=entity.get(idField);
idValue = entity.get(idField);
}
if(ObjectUtils.isEmpty(idValue)) {
return point.proceed();
}
//获取更新前实体
EntityBase beforeEntity=getEntity(serviceObj,idValue);
EntityBase beforeEntity = getEntity(serviceObj, idValue);
//执行更新操作
point.proceed();
//记录审计日志
dataAuditService.updateAudit(request,beforeEntity,serviceObj,idValue,auditFields);
dataAuditService.updateAudit(request, beforeEntity, serviceObj, idValue, auditFields);
return true;
}
return point.proceed();
......@@ -129,29 +124,27 @@ public class AuditAspect
*/
@Around("execution(* cn.ibizlab.core.*.service.*.remove(..))")
public Object remove(ProceedingJoinPoint point) throws Throwable {
HttpServletRequest request=null;
RequestAttributes requestAttributes= RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null){
request=((ServletRequestAttributes)requestAttributes).getRequest();
HttpServletRequest request = null;
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
if(requestAttributes!= null) {
request = ((ServletRequestAttributes)requestAttributes).getRequest();
}
Object serviceObj=point.getTarget();
Object args[]=point.getArgs();
Object serviceObj = point.getTarget();
Object args[] = point.getArgs();
if(ObjectUtils.isEmpty(args) || args.length==0) {
return point.proceed();
}
Object idValue=args[0];
EntityBase entity=getEntity(serviceObj,idValue);
Map<String, Audit> auditFields= DEFieldCacheMap.getAuditFields(entity.getClass());
if(auditFields.size()==0){
Object idValue = args[0];
EntityBase entity = getEntity(serviceObj, idValue);
Map<String, Audit> auditFields = DEFieldCacheMap.getAuditFields(entity.getClass());
if(auditFields.size()==0) {
return point.proceed();
}
else{
//执行删除操作
point.proceed();
//记录审计日志
dataAuditService.removeAudit(request,entity,idValue,auditFields);
dataAuditService.removeAudit(request, entity, idValue, auditFields);
return true;
}
}
......@@ -163,12 +156,12 @@ public class AuditAspect
* @return
*/
@SneakyThrows
private EntityBase getEntity(Object service, Object id){
EntityBase entity=null;
if(!ObjectUtils.isEmpty(service)){
private EntityBase getEntity(Object service, Object id) {
EntityBase entity = null;
if(!ObjectUtils.isEmpty(service)) {
EvaluationContext oldContext = new StandardEvaluationContext();
oldContext.setVariable("service",service);
oldContext.setVariable("id",id);
oldContext.setVariable("service", service);
oldContext.setVariable("id", id);
Expression oldExp = parser.parseExpression("#service.get(#id)");
return oldExp.getValue(oldContext, EntityBase.class);
}
......
ibzlite-util/src/main/java/cn/ibizlab/util/aspect/DEFieldDefaultValueAspect.java
浏览文件 @ 739701e4
......@@ -79,31 +79,31 @@ public class DEFieldDefaultValueAspect
Object[] args = joinPoint.getArgs();
if (args.length > 0) {
Object obj = args[0];
String actionName=joinPoint.getSignature().getName();
String actionName = joinPoint.getSignature().getName();
if(obj instanceof EntityBase) {
Map<String, DEField> deFields = DEFieldCacheMap.getDEFields(obj.getClass());
AuthenticationUser curUser = AuthenticationUser.getAuthenticationUser();
String keyField=DEFieldCacheMap.getDEKeyField(obj.getClass());
String keyField = DEFieldCacheMap.getDEKeyField(obj.getClass());
if(StringUtils.isEmpty(keyField)) {
return true;
}
fillDEField((EntityBase)obj, deFields,actionName,curUser,keyField);
fillDEField((EntityBase)obj, deFields, actionName, curUser, keyField);
}
else if (obj instanceof List) {
Map<String, DEField> deFields = null;
AuthenticationUser curUser = null;
String keyField = "";
for(Object item:(List)obj) {
for(Object item : (List)obj) {
if(item instanceof EntityBase) {
if(deFields==null) {
if(deFields == null) {
deFields = DEFieldCacheMap.getDEFields(item.getClass());
curUser = AuthenticationUser.getAuthenticationUser();
keyField=DEFieldCacheMap.getDEKeyField(item.getClass());
keyField = DEFieldCacheMap.getDEKeyField(item.getClass());
if(StringUtils.isEmpty(keyField)) {
return true;
}
}
fillDEField((EntityBase)item, deFields,actionName,curUser,keyField);
fillDEField((EntityBase)item, deFields, actionName, curUser, keyField);
}
}
}
......@@ -117,7 +117,7 @@ public class DEFieldDefaultValueAspect
* 填充系统预置属性
* @param et 当前实体对象
*/
private void fillDEField(EntityBase et, Map<String, DEField> deFields, String actionName,AuthenticationUser curUser,String keyField) throws Exception {
private void fillDEField(EntityBase et, Map<String, DEField> deFields, String actionName, AuthenticationUser curUser, String keyField) throws Exception {
if(deFields.size()==0) {
return;
}
......@@ -138,12 +138,12 @@ public class DEFieldDefaultValueAspect
DEPredefinedFieldType predefinedFieldType = fieldAnnotation.preType();
//填充系统默认值
if(actionName.toLowerCase().startsWith("create") && ( deFieldType!= DEFieldDefaultValueType.NONE || (!StringUtils.isEmpty(deFieldDefaultValue)) )){
if(actionName.toLowerCase().startsWith("create") && (deFieldType!= DEFieldDefaultValueType.NONE || (!StringUtils.isEmpty(deFieldDefaultValue)))) {
fillFieldDefaultValue(fieldname, deFieldType, deFieldDefaultValue, et , curUser) ;
}
//填充系统预置属性
if(predefinedFieldType != DEPredefinedFieldType.NONE){
fillPreFieldValue( fieldname, predefinedFieldType , et ,actionName ,fieldAnnotation.logicval(),curUser);
if(predefinedFieldType != DEPredefinedFieldType.NONE) {
fillPreFieldValue(fieldname, predefinedFieldType , et ,actionName ,fieldAnnotation.logicval(),curUser);
}
}
}
......@@ -156,17 +156,17 @@ public class DEFieldDefaultValueAspect
* @param et 当前实体对象
* @throws Exception
*/
private void fillFieldDefaultValue(String fieldname , DEFieldDefaultValueType deFieldType,String deFieldDefaultValue,EntityBase et ,AuthenticationUser curUser) throws Exception {
private void fillFieldDefaultValue(String fieldname, DEFieldDefaultValueType deFieldType, String deFieldDefaultValue, EntityBase et , AuthenticationUser curUser) throws Exception {
Object fieldValue = et.get(fieldname);
if(org.springframework.util.ObjectUtils.isEmpty(fieldValue)){
if(org.springframework.util.ObjectUtils.isEmpty(fieldValue)) {
//填充直接值及其余默认值类型
if( (deFieldType== DEFieldDefaultValueType.NONE && !StringUtils.isEmpty(deFieldDefaultValue)) || (deFieldType != DEFieldDefaultValueType.NONE) ){
switch(deFieldType){
if( (deFieldType== DEFieldDefaultValueType.NONE && !StringUtils.isEmpty(deFieldDefaultValue)) || (deFieldType != DEFieldDefaultValueType.NONE)) {
switch(deFieldType) {
case SESSION:
if(!StringUtils.isEmpty(deFieldDefaultValue)){
if(!StringUtils.isEmpty(deFieldDefaultValue)) {
Object sessionFieldValue = curUser.getSessionParams().get(deFieldDefaultValue.toLowerCase());
if(!ObjectUtils.isEmpty(sessionFieldValue)){
et.set(fieldname,sessionFieldValue);
if(!ObjectUtils.isEmpty(sessionFieldValue)) {
et.set(fieldname, sessionFieldValue);
}
}
break;
......@@ -174,91 +174,95 @@ public class DEFieldDefaultValueAspect
//暂未实现
break;
case UNIQUEID:
et.set(fieldname,(new AlternativeJdkIdGenerator()).generateId().toString().replace("-", ""));
et.set(fieldname, (new AlternativeJdkIdGenerator()).generateId().toString().replace("-", ""));
break;
case CONTEXT:
if(!StringUtils.isEmpty(deFieldDefaultValue)){
if(!StringUtils.isEmpty(deFieldDefaultValue)) {
Object paramFieldValue=et.get(deFieldDefaultValue);
if(!ObjectUtils.isEmpty(paramFieldValue)){
et.set(fieldname,paramFieldValue);
if(!ObjectUtils.isEmpty(paramFieldValue)) {
et.set(fieldname, paramFieldValue);
}
}
break;
case PARAM:
if(!StringUtils.isEmpty(deFieldDefaultValue)){
if(!StringUtils.isEmpty(deFieldDefaultValue)) {
Object paramFieldValue=et.get(deFieldDefaultValue);
if(!ObjectUtils.isEmpty(paramFieldValue)){
et.set(fieldname,paramFieldValue);
if(!ObjectUtils.isEmpty(paramFieldValue)) {
et.set(fieldname, paramFieldValue);
}
}
break;
case OPERATOR:
et.set(fieldname,curUser.getUserid());
et.set(fieldname, curUser.getUserid());
break;
case OPERATORNAME:
et.set(fieldname,curUser.getPersonname());
et.set(fieldname, curUser.getPersonname());
break;
case CURTIME:
et.set(fieldname,new Timestamp(new Date().getTime()));
et.set(fieldname, new Timestamp(new Date().getTime()));
break;
case APPDATA:
//暂未实现
break;
case NONE:
et.set(fieldname,deFieldDefaultValue);
et.set(fieldname, deFieldDefaultValue);
break;
}
}
}
}
private void fillPreFieldValue(String fieldname , DEPredefinedFieldType preFieldType ,EntityBase et , String actionName,String logicValue ,AuthenticationUser curUser) throws Exception {
private void fillPreFieldValue(String fieldname, DEPredefinedFieldType preFieldType, EntityBase et, String actionName, String logicValue, AuthenticationUser curUser) throws Exception {
Object fieldValue = et.get(fieldname);
//为预置属性进行赋值
if( actionName.toLowerCase().startsWith("create") ||
if(actionName.toLowerCase().startsWith("create") ||
preFieldType== DEPredefinedFieldType.UPDATEDATE|| preFieldType== DEPredefinedFieldType.UPDATEMAN||
preFieldType== DEPredefinedFieldType.UPDATEMANNAME){
preFieldType== DEPredefinedFieldType.UPDATEMANNAME) {
switch(preFieldType){//根据注解给预置属性填充值
switch(preFieldType) {
case CREATEMAN:
et.set(fieldname,curUser.getUserid());
et.set(fieldname, curUser.getUserid());
break;
case CREATEMANNAME:
et.set(fieldname,curUser.getPersonname());
et.set(fieldname, curUser.getPersonname());
break;
case UPDATEMAN:
et.set(fieldname,curUser.getUserid());
et.set(fieldname, curUser.getUserid());
break;
case UPDATEMANNAME:
et.set(fieldname,curUser.getPersonname());
et.set(fieldname, curUser.getPersonname());
break;
case CREATEDATE:
et.set(fieldname,new Timestamp(new Date().getTime()));
et.set(fieldname, new Timestamp(new Date().getTime()));
break;
case UPDATEDATE:
et.set(fieldname,new Timestamp(new Date().getTime()));
et.set(fieldname, new Timestamp(new Date().getTime()));
break;
case ORGID:
if(org.springframework.util.StringUtils.isEmpty(fieldValue))
et.set(fieldname,curUser.getOrgid());
if(org.springframework.util.StringUtils.isEmpty(fieldValue)) {
et.set(fieldname, curUser.getOrgid());
}
break;
case ORGNAME:
if(org.springframework.util.StringUtils.isEmpty(fieldValue))
et.set(fieldname,curUser.getOrgname());
if(org.springframework.util.StringUtils.isEmpty(fieldValue)) {
et.set(fieldname, curUser.getOrgname());
}
break;
case ORGSECTORID:
if(org.springframework.util.StringUtils.isEmpty(fieldValue))
et.set(fieldname,curUser.getMdeptid());
if(org.springframework.util.StringUtils.isEmpty(fieldValue)) {
et.set(fieldname, curUser.getMdeptid());
}
break;
case ORGSECTORNAME:
if(org.springframework.util.StringUtils.isEmpty(fieldValue))
et.set(fieldname,curUser.getMdeptname());
if(org.springframework.util.StringUtils.isEmpty(fieldValue)) {
et.set(fieldname, curUser.getMdeptname());
}
break;
case LOGICVALID:
if(StringUtils.isEmpty(logicValue)){
if(StringUtils.isEmpty(logicValue)) {
logicValue="1";
}
et.set(fieldname,logicValue);
et.set(fieldname, logicValue);
break;
}
}
......
ibzlite-util/src/main/java/cn/ibizlab/util/aspect/VersionCheckAspect.java
浏览文件 @ 739701e4
......@@ -32,61 +32,61 @@ import java.util.Map;
public class VersionCheckAspect
{
private final ExpressionParser parser = new SpelExpressionParser();
private final String IgnoreField="ignoreversioncheck";
private final String IgnoreField = "ignoreversioncheck";
@SneakyThrows
@Before("execution(* cn.ibizlab.*.rest.*.update(..)) && @annotation(versionCheck)")
public void BeforeUpdate(JoinPoint point, VersionCheck versionCheck){
public void BeforeUpdate(JoinPoint point, VersionCheck versionCheck) {
Object[] args = point.getArgs();
Object id=args[0];
Object dto=args[1];
Object id = args[0];
Object dto = args[1];
if(ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(dto)) {
return;
}
String versionField=versionCheck.versionfield();
String versionField = versionCheck.versionfield();
if(StringUtils.isEmpty(versionField)) {
return;
}
versionCheck(versionCheck,point.getTarget(),dto,id);
versionCheck(versionCheck,point.getTarget(), dto, id);
}
@SneakyThrows
@Before("execution(* cn.ibizlab.*.rest.*.updateBy*(..)) && @annotation(versionCheck)")
public void BeforeUpdateBy(JoinPoint point, VersionCheck versionCheck){
public void BeforeUpdateBy(JoinPoint point, VersionCheck versionCheck) {
Object[] args = point.getArgs();
if(args.length>=2){
Object id=args[args.length-2];
Object dto=args[args.length-1];
if(args.length>=2) {
Object id = args[args.length-2];
Object dto = args[args.length-1];
if(ObjectUtils.isEmpty(id) || ObjectUtils.isEmpty(dto)) {
return;
}
String versionField=versionCheck.versionfield();
String versionField = versionCheck.versionfield();
if(StringUtils.isEmpty(versionField)) {
return;
}
versionCheck(versionCheck,point.getTarget(),dto,id);
versionCheck(versionCheck, point.getTarget(), dto, id);
}
}
private void versionCheck(VersionCheck versionCheck,Object resource,Object dto,Object id ){
private void versionCheck(VersionCheck versionCheck, Object resource, Object dto, Object id) {
EvaluationContext context = new StandardEvaluationContext();
context.setVariable("dto",dto);
context.setVariable("dto", dto);
//忽略版本检查
Expression dtoParamsExp = parser.parseExpression("#dto.extensionparams");
Map dtoParam=dtoParamsExp.getValue(context, Map.class);
Map dtoParam = dtoParamsExp.getValue(context, Map.class);
if(!ObjectUtils.isEmpty(dtoParam) && !ObjectUtils.isEmpty(dtoParam.get(IgnoreField)) && dtoParam.get(IgnoreField).equals(1)) {
return;
}
Expression newExp = parser.parseExpression(String.format("#dto.%s",versionCheck.versionfield()));
Object newVersion=newExp.getValue(context);
Expression newExp = parser.parseExpression(String.format("#dto.%s", versionCheck.versionfield()));
Object newVersion = newExp.getValue(context);
if(ObjectUtils.isEmpty(newVersion)) {
return;
}
//进行版本检查
Object oldVersion =getDBVersion(versionCheck,getService(resource,versionCheck.entity()),id);
if(!ObjectUtils.isEmpty(oldVersion)){
if(RuleUtils.gt(newVersion,oldVersion)) {
throw new BadRequestAlertException("数据已变更，可能后台数据已被修改，请重新加载数据","VersionCheckAspect","versionCheck");
Object oldVersion = getDBVersion(versionCheck,getService(resource, versionCheck.entity()), id);
if(!ObjectUtils.isEmpty(oldVersion)) {
if(RuleUtils.gt(newVersion, oldVersion)) {
throw new BadRequestAlertException("数据已变更，可能后台数据已被修改，请重新加载数据", "VersionCheckAspect", "versionCheck");
}
}
}
......@@ -98,12 +98,12 @@ public class VersionCheckAspect
* @return
*/
@SneakyThrows
private Object getService(Object resource,String entity){
private Object getService(Object resource, String entity) {
Object service = null;
Field[] fields= resource.getClass().getDeclaredFields();
for(Field field : fields){
if(field.getModifiers()==1 && field.getName().equalsIgnoreCase(String.format("%sService",entity))){
service=field.get(resource);
Field[] fields = resource.getClass().getDeclaredFields();
for(Field field : fields) {
if(field.getModifiers()==1 && field.getName().equalsIgnoreCase(String.format("%sService",entity))) {
service = field.get(resource);
break;
}
}
......@@ -118,21 +118,21 @@ public class VersionCheckAspect
* @return
*/
@SneakyThrows
private Object getDBVersion(VersionCheck versionCheck,Object service,Object id){
private Object getDBVersion(VersionCheck versionCheck, Object service, Object id) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Timestamp dbVersion=null;
String versionField=versionCheck.versionfield();
if(!ObjectUtils.isEmpty(service)){
Timestamp dbVersion = null;
String versionField = versionCheck.versionfield();
if(!ObjectUtils.isEmpty(service)) {
EvaluationContext oldContext = new StandardEvaluationContext();
oldContext.setVariable("service",service);
oldContext.setVariable("id",id);
oldContext.setVariable("service", service);
oldContext.setVariable("id", id);
Expression oldExp = parser.parseExpression("#service.get(#id)");
EntityBase oldEntity =oldExp.getValue(oldContext, EntityBase.class);
Object oldDate=oldEntity.get(versionField);
if(oldDate!=null && oldDate instanceof Timestamp){
Timestamp db_time= (Timestamp) oldDate;
EntityBase oldEntity = oldExp.getValue(oldContext, EntityBase.class);
Object oldDate = oldEntity.get(versionField);
if(oldDate!=null && oldDate instanceof Timestamp) {
Timestamp db_time = (Timestamp) oldDate;
Date db_date = sdf.parse(sdf.format(db_time));
dbVersion=new Timestamp(db_date.getTime());
dbVersion = new Timestamp(db_date.getTime());
}
}
return dbVersion;
......
ibzlite-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ 739701e4
......@@ -46,14 +46,14 @@ public class PermissionSyncJob implements ApplicationRunner {
public void run(ApplicationArguments args) {
try {
Thread.sleep(10000);
InputStream permission= this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
InputStream permission = this.getClass().getResourceAsStream("/permission/systemResource.json"); //获取当前系统所有实体资源能力
String permissionResult = IOUtils.toString(permission,"UTF-8");
JSONObject system= new JSONObject();
system.put("pssystemid",systemId);
system.put("pssystemname",systemName);
system.put("sysstructure",JSONObject.parseObject(permissionResult));
system.put("md5check",DigestUtils.md5DigestAsHex(permissionResult.getBytes()));
if(client.syncSysAuthority(system)){
if(client.syncSysAuthority(system)) {
log.info("向[UAA]同步系统资源成功");
}else{
log.error("向[UAA]同步系统资源失败");
......@@ -64,9 +64,9 @@ public class PermissionSyncJob implements ApplicationRunner {
}
try {
InputStream sysModel= this.getClass().getResourceAsStream("/sysmodel/ibzlite.json"); //获取当前系统所有实体资源能力
InputStream sysModel = this.getClass().getResourceAsStream("/sysmodel/ibzlite.json"); //获取当前系统所有实体资源能力
String strSysModel = IOUtils.toString(sysModel,"UTF-8");
if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))){
if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))) {
log.info("向[lite]同步系统模型成功");
}else{
log.error("向[lite]同步系统模型失败");
......
ibzlite-util/src/main/java/cn/ibizlab/util/service/SimpleAuditService.java
浏览文件 @ 739701e4
......@@ -42,13 +42,13 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
*/
@Scheduled(fixedRate = 10000)
public void saveAudit() {
if(cacheMap.size()>0){
if(cacheMap.size()>0) {
log.info(String.format("正在保存审计数据，当前审计集合数量为[%s]",cacheMap.size()));
List temp=new ArrayList();
if(cacheMap.size()<500){
if(cacheMap.size()<500) {
temp.addAll(cacheMap);
}
else{
else {
temp.addAll(cacheMap.subList(0,500));
}
this.saveBatch(temp);
......@@ -66,17 +66,17 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
*/
@Override
public void createAudit(HttpServletRequest request, EntityBase entity, Object idValue, Map<String, Audit> auditFields) {
IBZDataAudit dataAudit =new IBZDataAudit();
IBZDataAudit dataAudit = new IBZDataAudit();
dataAudit.setOppersonid(AuthenticationUser.getAuthenticationUser().getUserid());
dataAudit.setOppersonname(String.format("%s[%s]",AuthenticationUser.getAuthenticationUser().getPersonname(),AuthenticationUser.getAuthenticationUser().getOrgname()));
dataAudit.setAudittype("CREATE");
dataAudit.setAuditobject(entity.getClass().getSimpleName());
dataAudit.setAuditobjectdata(idValue);
dataAudit.setOptime(new Timestamp(new Date().getTime()));
if(request!=null){
if(request != null) {
dataAudit.setIpaddress(getIpAddress(request, AuthenticationUser.getAuthenticationUser()));
}
dataAudit.setAuditinfo(getAuditInfo(entity,auditFields));
dataAudit.setAuditinfo(getAuditInfo(entity, auditFields));
dataAudit.setIsdatachanged(1);
cacheMap.add(dataAudit);
}
......@@ -90,24 +90,24 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @param auditFields
*/
@SneakyThrows
public void updateAudit(HttpServletRequest request, EntityBase beforeEntity, Object serviceObj, Object idValue, Map<String, Audit> auditFields){
public void updateAudit(HttpServletRequest request, EntityBase beforeEntity, Object serviceObj, Object idValue, Map<String, Audit> auditFields) {
//获取更新后的实体
EntityBase afterEntity=getEntity(serviceObj,idValue);
EntityBase afterEntity = getEntity(serviceObj, idValue);
//获取更新后的审计内容
String auditInfo=getUpdateAuditInfo(beforeEntity,afterEntity,auditFields);//比较更新前后差异内容
int isDataChanged=1;
String auditInfo = getUpdateAuditInfo(beforeEntity, afterEntity, auditFields);//比较更新前后差异内容
int isDataChanged = 1;
//审计内容是否发生变化
if(StringUtils.isEmpty(auditInfo)){
isDataChanged=0;
if(StringUtils.isEmpty(auditInfo)) {
isDataChanged = 0;
}
IBZDataAudit dataAudit =new IBZDataAudit();
IBZDataAudit dataAudit = new IBZDataAudit();
dataAudit.setOppersonid(AuthenticationUser.getAuthenticationUser().getUserid());
dataAudit.setOppersonname(String.format("%s[%s]",AuthenticationUser.getAuthenticationUser().getPersonname(),AuthenticationUser.getAuthenticationUser().getOrgname()));
dataAudit.setOppersonname(String.format("%s[%s]", AuthenticationUser.getAuthenticationUser().getPersonname(), AuthenticationUser.getAuthenticationUser().getOrgname()));
dataAudit.setAudittype("UPDATE");
dataAudit.setAuditobject(afterEntity.getClass().getSimpleName());
dataAudit.setAuditobjectdata(idValue);
dataAudit.setOptime(new Timestamp(new Date().getTime()));
if(request!=null){
if(request!=null) {
dataAudit.setIpaddress(getIpAddress(request, AuthenticationUser.getAuthenticationUser()));
}
dataAudit.setAuditinfo(auditInfo);
......@@ -122,55 +122,55 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @param idValue
* @param auditFields
*/
public void removeAudit(HttpServletRequest request,EntityBase entity,Object idValue,Map<String, Audit> auditFields){
IBZDataAudit dataAudit =new IBZDataAudit();
public void removeAudit(HttpServletRequest request, EntityBase entity, Object idValue, Map<String, Audit> auditFields) {
IBZDataAudit dataAudit = new IBZDataAudit();
dataAudit.setOppersonid(AuthenticationUser.getAuthenticationUser().getUserid());
dataAudit.setOppersonname(String.format("%s[%s]",AuthenticationUser.getAuthenticationUser().getPersonname(),AuthenticationUser.getAuthenticationUser().getOrgname()));
dataAudit.setOppersonname(String.format("%s[%s]", AuthenticationUser.getAuthenticationUser().getPersonname(), AuthenticationUser.getAuthenticationUser().getOrgname()));
dataAudit.setAudittype("REMOVE");
dataAudit.setAuditobject(entity.getClass().getSimpleName());
dataAudit.setAuditobjectdata(idValue);
dataAudit.setOptime(new Timestamp(new Date().getTime()));
if(request!=null){
if(request!=null) {
dataAudit.setIpaddress(getIpAddress(request, AuthenticationUser.getAuthenticationUser()));
}
dataAudit.setAuditinfo(getAuditInfo(entity,auditFields));
dataAudit.setAuditinfo(getAuditInfo(entity, auditFields));
dataAudit.setIsdatachanged(1);
cacheMap.add(dataAudit);
}
private String getAuditInfo(EntityBase entity, Map<String, Audit> auditFields){
String auditResult="";
if(auditFields.size()==0){
private String getAuditInfo(EntityBase entity, Map<String, Audit> auditFields) {
String auditResult = "";
if(auditFields.size() == 0) {
return auditResult;
}
Map<String, DEField> deFields= DEFieldCacheMap.getDEFields(entity.getClass());
if(deFields.size()==0){
Map<String, DEField> deFields = DEFieldCacheMap.getDEFields(entity.getClass());
if(deFields.size() == 0) {
return auditResult;
}
JSONArray auditFieldArray=new JSONArray();
JSONArray auditFieldArray = new JSONArray();
for (Map.Entry<String, Audit> auditField : auditFields.entrySet()) {
Object objFieldName=auditField.getKey();
String fieldName=String.valueOf(objFieldName);
DEField deField=null;
if(deFields.containsKey(fieldName)){
deField= deFields.get(fieldName);
Object objFieldName = auditField.getKey();
String fieldName = String.valueOf(objFieldName);
DEField deField = null;
if(deFields.containsKey(fieldName)) {
deField = deFields.get(fieldName);
}
if(ObjectUtils.isEmpty(deField)){
if(ObjectUtils.isEmpty(deField)) {
continue;
}
Object value=dataTransfer(entity.get(fieldName),deField.fieldType(),deField.format());
if(!StringUtils.isEmpty(value)){
JSONObject auditFieldObj=new JSONObject();
auditFieldObj.put("field",deField.value());
auditFieldObj.put("value",value);
if(!StringUtils.isEmpty(deField.dict())){
auditFieldObj.put("dict",deField.dict());
Object value = dataTransfer(entity.get(fieldName), deField.fieldType(), deField.format());
if(!StringUtils.isEmpty(value)) {
JSONObject auditFieldObj = new JSONObject();
auditFieldObj.put("field", deField.value());
auditFieldObj.put("value", value);
if(!StringUtils.isEmpty(deField.dict())) {
auditFieldObj.put("dict", deField.dict());
}
auditFieldArray.add(auditFieldObj);
}
}
if(auditFieldArray.size()>0){
auditResult=auditFieldArray.toString();
if(auditFieldArray.size()>0) {
auditResult = auditFieldArray.toString();
}
return auditResult;
}
......@@ -183,44 +183,44 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @return
*/
private String getUpdateAuditInfo(EntityBase oldData, EntityBase newData, Map<String, Audit> auditFields){
String auditResult="";
JSONArray auditFieldArray=new JSONArray();
if(auditFields.size()==0){
String auditResult = "";
JSONArray auditFieldArray = new JSONArray();
if(auditFields.size() == 0) {
return auditResult;
}
Map<String, DEField> deFields= DEFieldCacheMap.getDEFields(oldData.getClass());
if(deFields.size()==0){
Map<String, DEField> deFields = DEFieldCacheMap.getDEFields(oldData.getClass());
if(deFields.size() == 0){
return auditResult;
}
for (Map.Entry<String, Audit> auditField : auditFields.entrySet()) {
Object objFieldName=auditField.getKey();//获取注解字段
String fieldName=String.valueOf(objFieldName); //属性名称
DEField deField=null;
if(deFields.containsKey(fieldName)){
deField= deFields.get(fieldName);
Object objFieldName = auditField.getKey();//获取注解字段
String fieldName = String.valueOf(objFieldName); //属性名称
DEField deField = null;
if(deFields.containsKey(fieldName)) {
deField = deFields.get(fieldName);
}
if(ObjectUtils.isEmpty(deField)){
if(ObjectUtils.isEmpty(deField)) {
continue;
}
Object oldValue=oldData.get(fieldName);//老属性值
Object newValue=newData.get(fieldName);//新属性值
if(!compare(oldValue,newValue)){
oldValue=dataTransfer(oldValue,deField.fieldType(),deField.format());//属性值转换
newValue=dataTransfer(newValue,deField.fieldType(),deField.format());//属性值转换
JSONObject auditFieldObj=new JSONObject();
auditFieldObj.put("field",deField.value());
auditFieldObj.put("beforevalue",oldValue);
auditFieldObj.put("value",newValue);
if(!StringUtils.isEmpty(deField.dict())){
auditFieldObj.put("dict",deField.dict());
Object oldValue = oldData.get(fieldName);//老属性值
Object newValue = newData.get(fieldName);//新属性值
if(!compare(oldValue, newValue)) {
oldValue = dataTransfer(oldValue, deField.fieldType(), deField.format());//属性值转换
newValue = dataTransfer(newValue, deField.fieldType(), deField.format());//属性值转换
JSONObject auditFieldObj = new JSONObject();
auditFieldObj.put("field", deField.value());
auditFieldObj.put("beforevalue", oldValue);
auditFieldObj.put("value", newValue);
if(!StringUtils.isEmpty(deField.dict())) {
auditFieldObj.put("dict", deField.dict());
}
auditFieldArray.add(auditFieldObj);
}
}
if(auditFieldArray.size()>0){
auditResult=auditFieldArray.toString();
if(auditFieldArray.size()>0) {
auditResult = auditFieldArray.toString();
}
return auditResult;
}
......@@ -232,16 +232,16 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @param strFormat 转换字段格式化文本
* @return
*/
private String dataTransfer(Object value,String dataType, String strFormat){
if(value==null){
private String dataTransfer(Object value, String dataType, String strFormat) {
if(value==null) {
return "";
}
String transResult=value.toString();
if((dataType.equals("DATE") || dataType.equals("DATETIME") || dataType.equals("TIME")) && (!StringUtils.isEmpty(strFormat))){ //时间类型转换
Timestamp timestamp =(Timestamp)value;
Date date =timestamp;
SimpleDateFormat format =new SimpleDateFormat(strFormat);
transResult=format.format(date);
if((dataType.equals("DATE") || dataType.equals("DATETIME") || dataType.equals("TIME")) && (!StringUtils.isEmpty(strFormat))) { //时间类型转换
Timestamp timestamp = (Timestamp)value;
Date date = timestamp;
SimpleDateFormat format = new SimpleDateFormat(strFormat);
transResult = format.format(date);
}
return transResult;
}
......@@ -252,11 +252,11 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @param targetObj 比较目标对象
* @return
*/
private boolean compare(Object sourceObj,Object targetObj){
if(sourceObj==null && targetObj==null){
private boolean compare(Object sourceObj, Object targetObj) {
if(sourceObj == null && targetObj == null) {
return true;
}
if(sourceObj==null && targetObj!=null){
if(sourceObj == null && targetObj != null) {
return false;
}
return sourceObj.equals(targetObj);
......@@ -269,9 +269,9 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
* @return
*/
@SneakyThrows
private EntityBase getEntity(Object service, Object id){
EntityBase entity=null;
if(!ObjectUtils.isEmpty(service)){
private EntityBase getEntity(Object service, Object id) {
EntityBase entity = null;
if(!ObjectUtils.isEmpty(service)) {
EvaluationContext oldContext = new StandardEvaluationContext();
oldContext.setVariable("service",service);
oldContext.setVariable("id",id);
......@@ -288,15 +288,15 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
*/
public String getIpAddress(HttpServletRequest request, AuthenticationUser authenticationUser) {
//客户端有提交ip，以提交的ip为准
if(authenticationUser != null && !StringUtils.isEmpty(authenticationUser.getAddr())){
if(authenticationUser != null && !StringUtils.isEmpty(authenticationUser.getAddr())) {
return authenticationUser.getAddr();
}
if(request == null){
if(request == null) {
return "";
}
String Xip = request.getHeader("X-Real-IP");
String XFor = request.getHeader("X-Forwarded-For");
if(!StringUtils.isEmpty(XFor) && !"unKnown".equalsIgnoreCase(XFor)){
if(!StringUtils.isEmpty(XFor) && !"unKnown".equalsIgnoreCase(XFor)) {
//多次反向代理后会有多个ip值，第一个ip才是真实ip
int index = XFor.indexOf(",");
if(index != -1){
......@@ -306,7 +306,7 @@ public class SimpleAuditService extends ServiceImpl<IBZDataAuditMapper, IBZDataA
}
}
XFor = Xip;
if(!StringUtils.isEmpty(XFor) && !"unKnown".equalsIgnoreCase(XFor)){
if(!StringUtils.isEmpty(XFor) && !"unKnown".equalsIgnoreCase(XFor)) {
return XFor;
}
if (StringUtils.isEmpty(XFor) || "unknown".equalsIgnoreCase(XFor)) {
......
ibzlite-util/src/main/java/cn/ibizlab/util/service/SimpleFileService.java
浏览文件 @ 739701e4
......@@ -23,21 +23,21 @@ public class SimpleFileService implements FileService {
@Override
public FileItem saveFile(MultipartFile multipartFile) {
FileItem item=null;
FileItem item = null;
// 获取文件名
String fileName = multipartFile.getOriginalFilename();
// 获取文件后缀
String extname="."+getExtensionName(fileName);
String extname ="."+getExtensionName(fileName);
try {
String fileid= DigestUtils.md5DigestAsHex(multipartFile.getInputStream());
String fileid = DigestUtils.md5DigestAsHex(multipartFile.getInputStream());
String fileFullPath = this.fileRoot+"ibizutil"+File.separator+fileid+File.separator+fileName;
File file = new File(fileFullPath);
File parent = new File(file.getParent());
if(!parent.exists()){
if(!parent.exists()) {
parent.mkdirs();
}
FileCopyUtils.copy(multipartFile.getInputStream(),Files.newOutputStream(file.toPath()));
item=new FileItem(fileid,fileName,fileid,fileName,(int)multipartFile.getSize(),extname);
FileCopyUtils.copy(multipartFile.getInputStream(), Files.newOutputStream(file.toPath()));
item = new FileItem(fileid, fileName, fileid, fileName, (int)multipartFile.getSize(), extname);
} catch (IOException e) {
throw new InternalServerErrorException("文件上传失败，"+e);
}
......
ibzlite-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java
浏览文件 @ 739701e4
......@@ -19,19 +19,19 @@ import org.springframework.security.core.authority.AuthorityUtils;
@Primary
@Service("SimpleUserService")
@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:IBZUAAUserService}'.equals('SimpleUserService')")
public class SimpleUserService implements AuthenticationUserService{
public class SimpleUserService implements AuthenticationUserService {
@Override
public AuthenticationUser loadUserByUsername(String username) {
AuthenticationUser user = new AuthenticationUser();
String[] data=username.split("[|]");
String loginname=username;
String domains="";
String password="";
String[] data = username.split("[|]");
String loginname = username;
String domains = "";
String password = "";
if(data.length==2) {
loginname=data[0].trim();
domains=data[1].trim();
loginname = data[0].trim();
domains = data[1].trim();
}
user.setUserid(username);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或