Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.javayun-zuoyi
yunhao.wang
6 years ago
commit
0263ad0a90
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.base.enumutil;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
* @Description : 模块枚举类
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 21:08
|
||||
* @Modify:
|
||||
**/
|
||||
public class BlockEnumUtil {
|
||||
|
||||
|
||||
/**
|
||||
* 报表元素枚举
|
||||
* WORDS(1,"文字"),PIC(2,"图片"),REPORT(3,"报表");
|
||||
*/
|
||||
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
|
||||
public enum REPORT_ELEMENT_TYPE{
|
||||
|
||||
WORDS(1,"文字"),PIC(2,"图片"),REPORT(3,"报表");
|
||||
|
||||
private int value;
|
||||
private String description;
|
||||
|
||||
REPORT_ELEMENT_TYPE() {
|
||||
}
|
||||
|
||||
REPORT_ELEMENT_TYPE(int value, String description) {
|
||||
this.value = value;
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public int getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public static String valueOfDescription(int val) {
|
||||
String tmp = null;
|
||||
for (int i = 0; i < values().length; i++) {
|
||||
if (values()[i].value == val) {
|
||||
tmp = values()[i].description;
|
||||
}
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package cn.estsh.i3plus.pojo.model.common;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : 类属性选择模型
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-29 15:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class ClassFieldModel implements Serializable {
|
||||
|
||||
@ApiParam(value ="包名")
|
||||
private String packageName;
|
||||
|
||||
@ApiParam(value ="类名")
|
||||
private String clzSimpleName;
|
||||
|
||||
@ApiParam(value ="类全名")
|
||||
private String clzFullName;
|
||||
|
||||
@ApiParam(value ="属性名")
|
||||
private String fieldName;
|
||||
|
||||
@ApiParam(value ="属性描述")
|
||||
private String fieldDesc;
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package cn.estsh.i3plus.pojo.model.common;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description : 报表类选择模型
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-29 15:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class ClassModel implements Serializable {
|
||||
|
||||
@ApiParam(value ="包名")
|
||||
private String packageName;
|
||||
|
||||
@ApiParam(value ="类名")
|
||||
private String clzSimpleName;
|
||||
|
||||
@ApiParam(value ="类全名")
|
||||
private String clzFullName;
|
||||
|
||||
@ApiParam(value ="类描述")
|
||||
private String clzDesc;
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package cn.estsh.i3plus.pojo.model.platform;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : Adair Peng
|
||||
* @CreateDate : 2019-01-10 13:52
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class UserDetailPagerModel {
|
||||
|
||||
private UserDetailModel userDetailModel;
|
||||
|
||||
private Pager pager;
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 数据元素
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 19:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BR_ELEMENT")
|
||||
@Api(value="数据元素",description = "数据元素绑定对应的列")
|
||||
public class BrElement extends BaseBean {
|
||||
|
||||
@Column(name="ELEMENT_NAME")
|
||||
@ApiParam(value ="元素名称")
|
||||
private String elementName;
|
||||
|
||||
@Column(name="ELEMENT_TYPE")
|
||||
@ApiParam(value ="元素类型")
|
||||
//BlockEnumUtil.REPORT_ELEMENT_TYPE
|
||||
private Integer elementType;
|
||||
|
||||
@Column(name="ELEMENT_VALUE")
|
||||
@ApiParam(value ="元素值")
|
||||
private String elementValue;
|
||||
|
||||
@Column(name="ELEMENT_LINK")
|
||||
@ApiParam(value ="元素连接")
|
||||
private String elementLink;
|
||||
|
||||
@Column(name="ELEMENT_STYLE")
|
||||
@ApiParam(value ="元素样式css")
|
||||
private String elementStyle;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="元素明细列表")
|
||||
private List<BrReportElementDetail> brReportElementDetailList;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="元素所在的列")
|
||||
private BrLayoutColumn brLayoutColumn;
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 自定义报表布局
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 19:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BR_LAYOUT")
|
||||
@Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1")
|
||||
public class BrLayout extends BaseBean {
|
||||
|
||||
@Column(name="LAYOUT_NAME")
|
||||
@ApiParam(value ="名称")
|
||||
private String layoutName;
|
||||
|
||||
@Column(name="LAYOUT_WIDTH")
|
||||
@ApiParam(value ="布局宽度")
|
||||
private Double layoutWidth;
|
||||
|
||||
@Column(name="LAYOUT_HEIGHT")
|
||||
@ApiParam(value ="布局高度")
|
||||
private Double layoutHeight;
|
||||
|
||||
@Column(name="ROW_COUNT")
|
||||
@ApiParam(value ="行数")
|
||||
private Integer rowCount;
|
||||
|
||||
@Column(name="COLUMN_COUNT")
|
||||
@ApiParam(value ="列数")
|
||||
private Integer columnCount;
|
||||
|
||||
@Column(name="SEQ")
|
||||
@ApiParam(value ="排序")
|
||||
private Integer seq;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="模板行列表")
|
||||
private List<BrLayoutRow> brLayoutRowList;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="使用模板的报表")
|
||||
private List<BrReport> brReportList;
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 自定义报表布局
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 19:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BR_LAYOUT_COLUMN")
|
||||
@Api(value="自定义报表布局-列",description = "一行包含多列")
|
||||
public class BrLayoutColumn extends BaseBean {
|
||||
|
||||
@Column(name="LAYOUT_ID")
|
||||
@ApiParam(value ="布局主键")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long layoutId;
|
||||
|
||||
@Column(name="LAYOUT_ROW_ID")
|
||||
@ApiParam(value ="行主键")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long layoutRowId;
|
||||
|
||||
@Column(name="COLUMN_CROSS")
|
||||
@ApiParam(value ="跨列数")
|
||||
private Integer columnCross;
|
||||
|
||||
@Column(name="COLUMN_WIDTH")
|
||||
@ApiParam(value ="列宽")
|
||||
private Integer columnWidth;
|
||||
|
||||
@Column(name="SEQ")
|
||||
@ApiParam(value ="排序")
|
||||
private Integer seq;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="列所在的行")
|
||||
private BrLayoutRow brLayoutRow;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="列所包含的元素")
|
||||
private List<BrElement> brElementList;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="列所包含的报表模板")
|
||||
private List<BrReportTemplate> brReportTemplateList;
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 自定义报表布局
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 19:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BR_LAYOUT_ROW")
|
||||
@Api(value="自定义报表布局-行",description = "一个布局包含多行，一行包含多列")
|
||||
public class BrLayoutRow extends BaseBean {
|
||||
|
||||
@Column(name="LAYOUT_ID")
|
||||
@ApiParam(value ="布局主键")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long layoutId;
|
||||
|
||||
@Column(name="ROW_CROSS")
|
||||
@ApiParam(value ="跨行")
|
||||
private Integer rowCross;
|
||||
|
||||
@Column(name="ROW_HEIGHT")
|
||||
@ApiParam(value ="行高")
|
||||
private Integer rowHeight;
|
||||
|
||||
@Column(name="SEQ")
|
||||
@ApiParam(value ="排序")
|
||||
private Integer seq;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="行所在的布局")
|
||||
private BrLayout brLayout;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="行所包含的列")
|
||||
private List<BrLayoutColumn> brLayoutColumns;
|
||||
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : 自定义报表模板
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-25 19:54
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="BrReportTemplate")
|
||||
@Api(value="自定义报表模板",description = "报表模板，实现对应的报表生成方法")
|
||||
public class BrReportTemplate extends BaseBean {
|
||||
|
||||
@Column(name="LAYOUT_ID")
|
||||
@ApiParam(value ="布局主键")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long layoutId;
|
||||
|
||||
@Column(name="LAYOUT_COLUMN_ID")
|
||||
@ApiParam(value ="列主键")
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long layoutColumnId;
|
||||
|
||||
@Column(name="TEMPLATE_NAME")
|
||||
@ApiParam(value ="模板名称")
|
||||
private String templateName;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="报表模板列表")
|
||||
private List<BrReportTemplateDetail> brReportTemplateDetailList;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="元素所在的列")
|
||||
private BrLayoutColumn brLayoutColumn;
|
||||
}
|
||||
@ -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.BrElement;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrElementRepository extends BaseRepository<BrElement,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.BrElement;
|
||||
import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrLayoutColumnRepository extends BaseRepository<BrLayoutColumn,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.BrLayout;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrLayoutRepository extends BaseRepository<BrLayout,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.BrLayoutRow;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrLayoutRowRepository extends BaseRepository<BrLayoutRow,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.BrReportElementDetail;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrReportElementDetailRepository extends BaseRepository<BrReportElementDetail,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.BrReport;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrReportRepository extends BaseRepository<BrReport,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.BrReportTemplateDetail;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrReportTemplateDetailRepository extends BaseRepository<BrReportTemplateDetail,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.BrReportTemplate;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-12-26 20:23
|
||||
* @Modify:
|
||||
**/
|
||||
public interface BrReportTemplateRepository extends BaseRepository<BrReportTemplate,Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue