目录联调Bug 修复

模板Pojo 创建
模板枚举定义
yun-zuoyi
wei.peng 6 years ago
parent cb59664740
commit 7ccd5613b3

@ -141,4 +141,238 @@ public class BlockReportEnumUtil {
}
}
/**
*
* 1
* 2
* 3
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle");
private int value;
private String name;
private String description;
DATA_STATUS() {
}
DATA_STATUS(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* HQL WHERE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HQL_WHERE{
GT(1, ">", "大于"),
GT_EQUAL(2, ">=", "大于等于"),
LT(3, "<", "小于等于"),
LT_EQUAL(4, "<=", "小于等于"),
LIKE(5, "like", "模糊"),
LIKE_LEFT(6, "like", "左模糊"),
LIKE_RIGHT(7, "like", "右模糊"),
EQUAL(8, "=", "等于"),
EQUAL_NOT(9, "!=", "不等于"),
AND(10, "and", "AND"),
OR(11, "or", "OR"),
NOT(12, "not", "NOT"),
IS_NULL(13, "is null", "IS NULL"),
IS_NOT_NULL(14, "is not null", "IS NOT NULL");
private int value;
private String name;
private String description;
HQL_WHERE() {
}
HQL_WHERE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/***
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HQL_REF{
LEFT_JOIN(1, "left join", "左连接"),
RIGHT_JOIN(2, "right join", "右连接"),
INNER_JOIN(3, "inner join", "内连接");
private int value;
private String name;
private String description;
HQL_REF() {
}
HQL_REF(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HQL_AGGREGATION{
AVG(1, "avg", "平均值"),
MIN(2, "min", "最小值"),
MAX(3, "max", "最大值"),
SUM(4, "sum", "总和"),
COUNT(5, "count", "计数");
private int value;
private String name;
private String description;
HQL_AGGREGATION() {
}
HQL_AGGREGATION(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

@ -91,9 +91,15 @@ public class BrMenu extends BaseBean {
@ApiParam(value ="功能状态1.正常2.禁用)" , example ="1" , access ="功能状态1.正常2.禁用)",defaultValue="1")
private Integer menuStatus;
@Column(name="ROLE_NAMES_RDD")
@ApiParam(value ="角色名称" , access ="角色名称")
private String roleNamesRdd;
@Transient
@ApiParam(value ="角色ID 集合")
private List<Long> roleIdList = new ArrayList<>();
@Transient
@ApiParam(value ="子集列表")
private List<BrMenu> childList = new ArrayList<>();
}

@ -0,0 +1,82 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:32
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_POJO_ATTR")
@Api(value="报表模板",description = "报表模板")
public class BrPojoAttr extends BaseBean {
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板编号" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="SERVER_ID")
@ApiParam(value ="服务编号",example = "-1")
private Integer serverId;
@Column(name="POJO_CLASS_PATH")
@ApiParam(value ="对象ClassPath")
private String pojoClassPath;
@Column(name="POJO_NAME")
@ApiParam(value ="对象名称")
private String pojoName;
@Column(name="POJO_NAME_ALIAS")
@ApiParam(value ="对象别名")
private String pojoNameAlias;
@Column(name="ATTR_TYPE")
@ApiParam(value ="属性类型",example = "-1")
private Integer attrType;
@Column(name="ATTR_REF_TYPE")
@ApiParam(value ="关系类型",example = "-1")
private Integer attrRefType;
@Column(name="DATA_TYPE")
@ApiParam(value ="数据类型",example = "-1")
private Integer dataType;
@Column(name="AGGREGATION_TYPE")
@ApiParam(value ="聚合类型",example = "-1")
private Integer aggregationType;
@Column(name="ATTR_SORT")
@ApiParam(value ="字段排序")
private Integer attrSort;
@Column(name="ATTR_DEFAULT_VALUE")
@ApiParam(value ="属性默认值")
private String attrDefaultValue;
@Column(name="ATTR_SHOW")
@ApiParam(value ="属性是否显示",example = "-1")
private Integer attrShow;
}

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:32
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_REF_POJO")
@Api(value="报表模板",description = "报表模板")
public class BrRefPojo extends BaseBean {
@Column(name="MASTER_TEMPLATE_ID")
@ApiParam(value ="模板编号" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long masterTemplateId;
@Column(name="REF_TYPE")
@ApiParam(value ="关系类型")
private Integer refType;
@Column(name="MASTER_SERVER_ID")
@ApiParam(value ="主服务编号" ,example = "-1")
private Integer masterServerId;
@Column(name="MASTER_POJO_NAME")
@ApiParam(value ="副对象名称")
private String masterPojoName;
@Column(name="MASTER_POJO_NAME_ALIAS")
@ApiParam(value ="主对象别名")
private String masterPojoNameAlias;
@Column(name="MASTER_POJO_NAME_ATTR_NAME")
@ApiParam(value ="主对象属性名称" )
private String masterPojoAttName;
@Column(name="SECONDARY_SERVER_ID")
@ApiParam(value ="主服务编号")
private Integer secondaryServerId;
@Column(name="SECONDARY_POJO_NAME")
@ApiParam(value ="副对象名称")
private String secondaryPojoName;
@Column(name="SECONDARY_POJO_NAME_ALIAS")
@ApiParam(value ="副对象别名" )
private String secondaryPojoNameAlias;
@Column(name="SECONDARY_POJO_ATTR_NAME")
@ApiParam(value ="副对象属性名称")
private String secondaryPojoAttrName;
}

@ -0,0 +1,62 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:31
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_REF_SERVER_POJO")
@Api(value="报表模板",description = "报表模板")
public class BrRefServerPojo extends BaseBean {
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板编号" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_NAME_RDD")
@ApiParam(value ="模板名称" , access ="模板名称")
private String templateNameRdd;
@Column(name="SERVER_ID")
@ApiParam(value ="服务编号" ,example = "-1")
private Integer serverId;
@Column(name="SERVER_NAME_RDD")
@ApiParam(value ="服务名称" , access ="模板名称")
private String serverNameRdd;
@Column(name="SERVER_POJO_NAME_RDD")
@ApiParam(value ="服务对象名称" , access ="模板名称")
private String serverPojoNameRdd;
@Column(name="SERVER_POJO_NAME_ALIAS")
@ApiParam(value ="服务对象别名" , access ="模板名称")
private String serverPojoNameAlias;
@Column(name="SERVER_POJO_CLASS_PATH")
@ApiParam(value ="服务对象名称" , access ="模板名称")
private String serverPojoClassPath;
}

@ -0,0 +1,50 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:31
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_REF_TEMPLATE_SERVER")
@Api(value="报表模板",description = "报表模板")
public class BrRefTemplateServer extends BaseBean {
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板编号" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_NAME_RDD")
@ApiParam(value ="模板名称" , access ="模板名称")
private String templateNameRdd;
@Column(name="SERVER_ID")
@ApiParam(value ="服务编号" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long serverId;
@Column(name="SERVER_NAME_RDD")
@ApiParam(value ="服务名称" , access ="模板名称")
private String serverNameRdd;
}

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:23
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_CUSTOM_HQL")
@Api(value="报表模板",description = "报表模板")
public class BrTemplate extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="模板名称" , access ="模板名称")
private String name;
@Column(name="TEMPLATE_TYPE")
@ApiParam(value ="模板类型" , example ="-1",access="表格,图表")
private Integer templateType;
@Column(name="TEMPLATE_STATUS")
@ApiParam(value ="模板状态" , example ="-1",access="模板状态")
private Integer templateStatus;
@Column(name="NUM_POJO")
@ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
private Integer numPojo;
@Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT")
@ApiParam(value ="对象名称" , access ="对象名称")
private String templatePojoNamesRdd;
@Column(name="NUM_SERVER")
@ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
private Integer numServer;
@Column(name="TEMPLATE_SERVER_NAMES_RDD",columnDefinition = "TEXT")
@ApiParam(value ="服务名称" , access ="服务名称")
private String templateServerNamesRdd;
@Column(name="NUM_TEMPLATE_ATTR_FILTER")
@ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
private Integer numTemplateAttrFilter;
@Column(name="template_attr_filter_list",columnDefinition = "TEXT")
@ApiParam(value ="模板查询条件" , access ="模板查询条件")
private String templateAttrFilterList;
@Column(name="NUM_TEMPLATE_ATTR_FILTER_GROUP")
@ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
private Integer numTemplateAttrFilterGroup;
@Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT")
@ApiParam(value ="模板分组条件" , access ="模板分組条件")
private String templateAttrFilterGroupList;
@Column(name="NUM_TEMPLATE_ATTR_SHOW")
@ApiParam(value ="对象数量" , example ="0" , access ="权限模块数量")
private Integer numTemplateAttrShow;
@Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT")
@ApiParam(value ="模板显示属性" , access ="模板显示属性")
private String templateAttrShowList;
@Column(name="TEMPLATE_DESCRIPTION")
@ApiParam(value ="模板描述" , access ="模板描述")
private String templateDescription;
@Column(name="TEMPLATE_HTML",columnDefinition = "TEXT")
@ApiParam(value ="模板HTML" , access ="模板HTML")
private String templateHtml;
}

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.report.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 11:23
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BR_TEMPLATE_CUSTOM_HQL")
@Api(value="模板自定义语句",description = "模板自定义语句")
public class BrTemplateCustomHql extends BaseBean {
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板编号" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="CUSTOM_TYPE")
@ApiParam(value ="自定义类型" , example ="-1")
private Integer customType;
@Column(name="CUSTOM_CONTENT",columnDefinition="TEXT")
@ApiParam(value ="自定义语句内容" , access ="自定义语句内容")
private String customContent;
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrMenu;
import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:03
* @Modify:
**/
public interface BrPojoAttrRepository extends BaseRepository<BrPojoAttr,Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrRefPojo;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:04
* @Modify:
**/
public interface BrRefPojoRepository extends BaseRepository<BrRefPojo,Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrMenu;
import cn.estsh.i3plus.pojo.report.bean.BrRefServerPojo;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:05
* @Modify:
**/
public interface BrRefServerPojoRepository extends BaseRepository<BrRefServerPojo,Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrMenu;
import cn.estsh.i3plus.pojo.report.bean.BrRefTemplateServer;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:05
* @Modify:
**/
public interface BrRefTemplateServerRepository extends BaseRepository<BrRefTemplateServer,Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrMenu;
import cn.estsh.i3plus.pojo.report.bean.BrTemplateCustomHql;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:05
* @Modify:
**/
public interface BrTemplateCustomHqlRepository extends BaseRepository<BrTemplateCustomHql,Long> {
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.report.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.report.bean.BrTemplate;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-01-18 15:05
* @Modify:
**/
public interface BrTemplateRepository extends BaseRepository<BrTemplate,Long> {
}
Loading…
Cancel
Save