From d7c9647ca50abba2ad320d86ece7e2a63b42fb3b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Mar 2020 14:36:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 116 --------------------- 1 file changed, 116 deletions(-) delete mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java deleted file mode 100644 index 9e7722d..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ /dev/null @@ -1,116 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.sqlpack; - -import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; -import com.mongodb.BasicDBObject; -import org.bson.conversions.Bson; - -/** - * @Description : Bson对象封装 - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-11-08 13:15 - * @Modify: - **/ -public class CoreBsonPack { - - /** - * 日志复杂查询 - * - * @param logSystem - * @return - */ - public static Bson packBsonByLogSystem(SysLogSystem logSystem) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson); - bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson); - bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false); - bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson); - bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson); - - return bson; - } - - /** - * 系统操作日志 - * - * @param logOperate - * @return - */ - public static Bson packBsonByLogOperate(SysLogOperate logOperate) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson); - bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson); - bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false); - bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson); - bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson); - - return bson; - } - - /** - * 系统异常日志复杂查询 - * - * @param sysLogException - * @return - */ - public static Bson packBsonBySysLogException(SysLogException sysLogException) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson); - bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson); - bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false); - - return bson; - } - - /** - * 定时任务日志复杂查询 - * - * @param sysLogTaskTime - * @return - */ - public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson); - bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson); - bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false); - - return bson; - } - - /** - * 区间 - * - * @param colName - * @param min - * @param max - * @return - */ - public static Bson packBsonByInterval(String colName, Object min, Object max) { - Bson bson = new BasicDBObject(); - - bson = BsonPackTool.getNumBiggerPack(min, colName, bson); - bson = BsonPackTool.getNumSmallerPack(max, colName, bson); - - return bson; - } - - /** - * 指定日期之后 - * @param dateTime 日期 - * @return - */ - public static Bson packBsonByDateTimeAfter(String dateTime){ - return BsonPackTool.timeLess(dateTime, "createDatetime", null, true); - } -} From 262edb9fec111c7a6445aa5c4f6d274f854840ed Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 13 Mar 2020 17:33:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96,=20Es=20Tool=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E8=81=9A=E5=90=88=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 57bb047..c9d392c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -54,6 +54,10 @@ public class SysLogOperate extends BaseBean { @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") private Integer operateType; + public String getOperateTypeName(){ + return ImppEnumUtil.OPERATE_TYPE.valueOfCode(operateType); + } + @Column(name="OPERATE_MESSAGE") @ApiParam(value ="操作信息" , access ="操作信息") private String operateMessage; From 549f2ff7979a6d655f730daa09aad36892fc6dd1 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 23 Mar 2020 18:43:46 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90=20.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index fff23d9..302aa0f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1871,4 +1871,50 @@ public class CommonEnumUtil { } } + /** + * 变量类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LICENSE_SOURCE { + LOCAL_SYSTEM_FILE(1, "本地文件"), + NETWORK_ESTSH(2, "网络-官方授权"), + SENSE_HARDWARE_USB_LOCK(3, "硬件锁"), + SENSE_SOFTWARE_CODE_LOCK(4, "软锁"); + + private int value; + private String description; + + private LICENSE_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From c8c7c733362e7a986c6b7d13e4690ff8a642876c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Mar 2020 11:28:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E5=B8=83=E5=B1=80,=E5=85=83=E7=B4=A0,=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockReportEnumUtil.java | 10 +- .../pojo/model/report/BrDynamicPageModel.java | 37 +++++ .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 33 +---- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 160 ++++++++++----------- .../i3plus/pojo/report/bean/BrLayoutElement.java | 76 ++++++++++ .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 132 ++++++++--------- .../{BrRefReportTypeset.java => BrRefReport.java} | 50 +++---- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 39 ++--- .../i3plus/pojo/report/bean/BrReportTemplate.java | 2 +- .../repository/BrLayoutColumnRepository.java | 28 ++-- ...ository.java => BrLayoutElementRepository.java} | 4 +- .../report/repository/BrLayoutRowRepository.java | 28 ++-- .../report/repository/BrRefReportRepository.java | 14 ++ .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 46 ++++-- 14 files changed, 380 insertions(+), 279 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/{BrRefReportTypeset.java => BrRefReport.java} (60%) rename modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/{BrRefReportTypesetRepository.java => BrLayoutElementRepository.java} (58%) create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index f012813..8f6a2f2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -785,20 +785,20 @@ public class BlockReportEnumUtil { /** * 报表排版枚举 - * ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + * ELEMENT(1,"元素"),TEMPLATE(2,"对象视图"); */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TYPESET_TYPE{ + public enum REPORT_REF_TYPE{ - ELEMENT(1,"元素"),TEMPLATE(2,"模板"); + ELEMENT(1,"元素"),TEMPLATE(2,"对象视图"); private int value; private String description; - REPORT_TYPESET_TYPE() { + REPORT_REF_TYPE() { } - REPORT_TYPESET_TYPE(int value, String description) { + REPORT_REF_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java new file mode 100644 index 0000000..9dc5df5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.model.report; + +import cn.estsh.i3plus.pojo.report.bean.BrElement; +import cn.estsh.i3plus.pojo.report.bean.BrLayout; +import cn.estsh.i3plus.pojo.report.bean.BrRefReport; +import cn.estsh.i3plus.pojo.report.bean.BrReport; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-3-24 下午3:28 + * @Modify: + **/ +@Data +public class BrDynamicPageModel { + + @ApiParam(value ="报表信息") + private BrReport report; + + @ApiParam(value ="布局信息") + private BrLayout layout; + + @ApiParam(value = "报表排版关系") + private List refReportList; + + @ApiParam(value ="页面元素内容") + private List elementList; + + @ApiParam(value ="页面元素内容") + private List templateModelList; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 8f74c2a..0c06f20 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -28,41 +28,16 @@ import java.util.List; @Api(value="自定义报表布局",description = "单独进行管理，生成报表是使用。报表实例 * -》 1") public class BrLayout extends BaseBean { + private static final long serialVersionUID = -3790563562881742852L; @Column(name="LAYOUT_NAME") - @ApiParam(value ="名称") + @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="LAYOUT_ROW_COUNT") - @ApiParam(value ="行数") - private Integer layoutRowCount; - - @Column(name="LAYOUT_COLUMN_COUNT") - @ApiParam(value ="列数") - private Integer layoutColumnCount; - - @Column(name="LAYOUT_REPORT_COUNT") - @ApiParam(value ="引用报表数量") - private Integer layoutReportCount; - -// @Lob -// @Column(name="LAYOUT_HTML") -// @ApiParam(value ="布局html") -// private String layoutHtml; -// -// @Lob @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value ="布局描述") private String layoutDescription; @Transient - @ApiParam(value ="模板行列表") - private List brLayoutRows; + @ApiParam(value ="行所包含的元素") + private List elementList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 19ca013..5df1631 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -1,80 +1,80 @@ -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 org.hibernate.annotations.Type; - -import javax.persistence.*; -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_COLSPAN") - @ApiParam(value ="跨列数") - private Integer columnColspan; - - @Column(name="COLUMN_ROWSPAN") - @ApiParam(value ="跨行数") - private Integer columnRowspan; - - @Column(name="COLUMN_WIDTH") - @ApiParam(value ="列宽") - private Integer columnWidth; - - @Column(name="COLUMN_HEIGHT") - @ApiParam(value ="列高") - private Integer columnHeight; - - @Column(name="COLUMN_STYLE") - @ApiParam(value ="列样式") - private String columnStyle; - - @Column(name="COLUMN_SEQ") - @ApiParam(value ="序列") - private Integer columnSeq; - - @Column(name="COLUMN_SORT") - @ApiParam(value ="排序，降序") - private Integer columnSort; - -// @Lob - @Column(name = "COLUMN_DESCRIPTION") - @ApiParam(value ="列描述") - private String columnDescription; - -// @Lob -// @Column(name="COLUMN_HTML") -// @ApiParam(value ="列html") -// private String columnHtml; -} +//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 org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//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_COLSPAN") +// @ApiParam(value ="跨列数") +// private Integer columnColspan; +// +// @Column(name="COLUMN_ROWSPAN") +// @ApiParam(value ="跨行数") +// private Integer columnRowspan; +// +// @Column(name="COLUMN_WIDTH") +// @ApiParam(value ="列宽") +// private Integer columnWidth; +// +// @Column(name="COLUMN_HEIGHT") +// @ApiParam(value ="列高") +// private Integer columnHeight; +// +// @Column(name="COLUMN_STYLE") +// @ApiParam(value ="列样式") +// private String columnStyle; +// +// @Column(name="COLUMN_SEQ") +// @ApiParam(value ="序列") +// private Integer columnSeq; +// +// @Column(name="COLUMN_SORT") +// @ApiParam(value ="排序，降序") +// private Integer columnSort; +// +//// @Lob +// @Column(name = "COLUMN_DESCRIPTION") +// @ApiParam(value ="列描述") +// private String columnDescription; +// +//// @Lob +//// @Column(name="COLUMN_HTML") +//// @ApiParam(value ="列html") +//// private String columnHtml; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java new file mode 100644 index 0000000..deb7fed --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java @@ -0,0 +1,76 @@ +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 : wei.peng + * @CreateDate : 20-3-24 下午2:39 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BR_LAYOUT_ELEMENT") +@Api(value = "自定义报表布局元素") +public class BrLayoutElement extends BaseBean { + + @Column(name = "LAYOUT_ID") + @ApiParam(value = "布局主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long layoutId; + + @Column(name = "PARENT_ID") + @ApiParam(value = "父节点主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + + @Column(name = "ELEMENT_TEXT") + @ApiParam(value ="元素描述") + private String elementText; + + @Column(name="ELEMENT_SEQ") + @ApiParam(value ="序列") + private Integer elementSeq = 0; + + @Column(name="ELEMENT_WIDTH") + @ApiParam(value ="列宽") + private Integer elementWidth; + + @Column(name="ELEMENT_HEIGHT") + @ApiParam(value ="列高") + private Integer elementHeight; + + @Column(name="ELEMENT_STYLE") + @ApiParam(value ="列样式") + private String elementStyle; + + @Column(name="ELEMENT_CSS_CLASS") + @ApiParam(value ="列样式") + private String elementCssClass; + + @Column(name = "ELEMENT_DESCRIPTION") + @ApiParam(value ="元素描述") + private String elementDescription; + + @Transient + @ApiParam(value ="行所包含的元素") + private List elementList; +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index bf6eaa1..784a9d5 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -1,67 +1,67 @@ -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 org.hibernate.annotations.Type; - -import javax.persistence.*; -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_WIDTH") - @ApiParam(value ="行宽") - private Integer rowWidth; - - @Column(name="ROW_HEIGHT") - @ApiParam(value ="行高") - private Integer rowHeight; - - @Column(name="ROW_SORT") - @ApiParam(value ="排序") - private Integer rowSort; - - @Lob - @Column(name="ROW_STYLE") - @ApiParam(value ="行样式") - private String rowStyle; - - @Column(name="ROW_COL_NUM") - @ApiParam(value ="行所关联列数") - private Integer rowColNum; - +//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 org.hibernate.annotations.Type; +// +//import javax.persistence.*; +//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_WIDTH") +// @ApiParam(value ="行宽") +// private Integer rowWidth; +// +// @Column(name="ROW_HEIGHT") +// @ApiParam(value ="行高") +// private Integer rowHeight; +// +// @Column(name="ROW_SORT") +// @ApiParam(value ="排序") +// private Integer rowSort; +// // @Lob -// @Column(name="ROW_HTML") -// @ApiParam(value ="行html") -// private String rowHtml; - - @Transient - @ApiParam(value ="行所包含的列") - private List brLayoutColumns; -} +// @Column(name="ROW_STYLE") +// @ApiParam(value ="行样式") +// private String rowStyle; +// +// @Column(name="ROW_COL_NUM") +// @ApiParam(value ="行所关联列数") +// private Integer rowColNum; +// +//// @Lob +//// @Column(name="ROW_HTML") +//// @ApiParam(value ="行html") +//// private String rowHtml; +// +// @Transient +// @ApiParam(value ="行所包含的列") +// private List brLayoutColumns; +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java similarity index 60% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java index 286e9ef..76cfc25 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReport.java @@ -12,8 +12,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 元素和报表关联表，多对多 @@ -27,46 +28,41 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BR_REF_REPORT_TYPESET") +@Table(name="BR_REF_REPORT") @Api(value="元素&模板&报表",description = "报表，元素和模板的关联表 * -》 *") -public class BrRefReportTypeset extends BaseBean { +public class BrRefReport extends BaseBean { + private static final long serialVersionUID = 7860212457391123584L; @Column(name = "REPORT_ID") @ApiParam(value = "报表主键") @JsonSerialize(using = ToStringSerializer.class) private Long reportId; - @Column(name = "REPORT_NAME_RDD") - @ApiParam(value = "报表名称") - private String reportNameRdd; - - @Column(name = "REPORT_TYPESET_TYPE") - @ApiParam(value = "报表列类型") - private Integer reportTypesetType; + @Column(name="LAYOUT_ID") + @ApiParam(value ="布局主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long layoutId; - @Column(name = "LAYOUT_COLUMN_ID") - @ApiParam(value = "布局列主键") + @Column(name = "LAYOUT_ELEMENT_ID") + @ApiParam(value = "布局元素主键") @JsonSerialize(using = ToStringSerializer.class) - private Long layoutColumnId; + private Long layoutElementId; + + @Column(name="REF_TYPE_ID") + @ApiParam(value ="序列") + private Integer refTypeId; - /** - * 关联id，元素或模板id - */ @Column(name = "REF_ID") @ApiParam(value = "关联id") @JsonSerialize (using = ToStringSerializer.class) private Long refId; -// /** -// * 关联元素或模板html -// */ -// @Lob -// @Column(name = "REF_HTML") -// @ApiParam(value = "关联对象html") -// private String refHtml; + @Column(name = "REF_NAME_RDD") + @ApiParam(value = "关联对象名称") + private String refNameRdd; + + @Transient + @ApiParam(value = "关联对象") + private Object refObject; - @Lob - @Column(name = "TYPESET_DESCRIPTION") - @ApiParam(value ="排版描述") - private String typesetDescription; } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index f424ef0..057c231 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -10,7 +10,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -29,6 +32,7 @@ import java.util.List; @Api(value="自定义报表",description = "所有报表实例，生成最后的报表") public class BrReport extends BaseBean { + private static final long serialVersionUID = 1987404021291348713L; @Column(name="REPORT_NAME") @ApiParam(value ="报表名称") private String reportName; @@ -38,46 +42,19 @@ public class BrReport extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - //get单独处理 - public Long getLayoutId() { - if(layoutId != null) { - return layoutId.longValue(); - }else{ - return layoutId; - } - } - @Column(name="LAYOUT_NAME_RDD") @ApiParam(value ="布局名称") private String layoutNameRdd; - @Lob - @Column(name="LAYOUT_HTML") - @ApiParam(value ="报表html") - private String reportHtml; - - @Column(name="SEQ") - @ApiParam(value ="排序") - private Integer seq; - - @Column(name="TEMPLATE_NUM") - @ApiParam(value ="模板数量") - private Integer templateNum; - - @Column(name="ELEMENT_NUM") - @ApiParam(value ="元素数量") - private Integer elementNum; - - @Lob @Column(name = "REPORT_DESCRIPTION") @ApiParam(value ="报表描述") private String reportDescription; @Transient - @ApiParam(value = "报表关联布局对象") - private BrLayout brLayout; + @ApiParam(value = "报表排版关系") + private BrLayout layout; @Transient @ApiParam(value = "报表排版关系") - private List brRefReportTypesetList; + private List brRefReportList; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java index 5fb16dc..15b43da 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReportTemplate.java @@ -48,7 +48,7 @@ // // @Transient // @ApiParam(value ="报表模板列表") -// private List brRefReportTypesetList; +// private List brRefReportList; // // @Transient // @ApiParam(value ="元素所在的列") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java index 83eab7d..d354521 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutColumnRepository.java @@ -1,14 +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.BrLayoutColumn; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-26 20:23 - * @Modify: - **/ -public interface BrLayoutColumnRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrLayoutColumn; +// +///** +// * @Description : +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-26 20:23 +// * @Modify: +// **/ +//public interface BrLayoutColumnRepository extends BaseRepository { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java similarity index 58% rename from modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java rename to modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java index 15695f9..be95592 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportTypesetRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutElementRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.report.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; +import cn.estsh.i3plus.pojo.report.bean.BrLayoutElement; /** * @Description : @@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.report.bean.BrRefReportTypeset; * @CreateDate : 2018-12-26 20:23 * @Modify: **/ -public interface BrRefReportTypesetRepository extends BaseRepository { +public interface BrLayoutElementRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java index 78fa134..2588317 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrLayoutRowRepository.java @@ -1,14 +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 { -} +//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 { +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java new file mode 100644 index 0000000..40aa7b1 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrRefReportRepository.java @@ -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.BrRefReport; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-12-26 20:23 + * @Modify: + **/ +public interface BrRefReportRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 5d5ce2b..e485855 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -99,14 +99,14 @@ public class ReportHqlPack { * @param brElement * @return */ - public static String packHqlBrElement(BrElement brElement){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrElement(BrElement brElement){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brElement); // 查询参数封装 - HqlPack.getNumEqualPack(brElement.getElementType(),"elementType",result); - HqlPack.getStringLikerPack(brElement.getElementName(),"elementName",result); + DdlPreparedPack.getNumEqualPack(brElement.getElementType(),"elementType",result); + DdlPreparedPack.getStringLikerPack(brElement.getElementName(),"elementName",result); - return result.toString(); + return result; } /** @@ -158,14 +158,32 @@ public class ReportHqlPack { * @param brReport * @return */ - public static String packHqlBrReport(BrReport brReport){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBrReport(BrReport brReport){ + DdlPackBean result = DdlPackBean.getDdlPackBean(brReport); // 查询参数封装 - HqlPack.getStringLikerPack(brReport.getReportName(),"reportName",result); - HqlPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); + DdlPreparedPack.getStringLikerPack(brReport.getReportName(),"reportName",result); + DdlPreparedPack.getNumEqualPack(brReport.getLayoutId(),"layoutId",result); - return result.toString(); + return result; + } + + /** + * 报表查询 + * @param refReport + * @return + */ + public static DdlPackBean packHqlBrRefReport(BrRefReport refReport){ + DdlPackBean result = DdlPackBean.getDdlPackBean(refReport); + + // 查询参数封装 + DdlPreparedPack.getNumEqualPack(refReport.getReportId(),"reportId",result); + DdlPreparedPack.getNumEqualPack(refReport.getLayoutId(),"layoutId",result); + DdlPreparedPack.getNumEqualPack(refReport.getLayoutElementId(),"layoutElementId",result); + DdlPreparedPack.getNumEqualPack(refReport.getRefTypeId(),"refTypeId",result); + DdlPreparedPack.getNumEqualPack(refReport.getRefId(),"refId",result); + + return result; } /** @@ -225,4 +243,12 @@ public class ReportHqlPack { return result; } + + public static DdlPackBean packHqlBrLayoutElement(BrLayoutElement bean){ + DdlPackBean result = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getNumEqualPack(bean.getLayoutId(),"layoutId",result); + + return result; + } } From 02b5fc715a72a0e99633ba6a3baf45ae21b580fc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Mar 2020 14:51:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java | 1 + 10 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 6a28634..961eabb 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -29,6 +29,7 @@ import java.util.List; @Api(value="数据元素",description = "数据元素绑定对应的列") public class BrElement extends BaseBean { + private static final long serialVersionUID = -4332881435058594175L; @Column(name="ELEMENT_NAME") @ApiParam(value ="元素名称") private String elementName; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java index deb7fed..8fd65cc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value = "自定义报表布局元素") public class BrLayoutElement extends BaseBean { + private static final long serialVersionUID = 3684811659039862857L; @Column(name = "LAYOUT_ID") @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java index 9958379..e580eab 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrMenu.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="报表目录",description = "报表目录") public class BrMenu extends BaseBean { + private static final long serialVersionUID = -247488761545602540L; @Column(name="NAME") @ApiParam(value ="功能名称") private String name; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java index b114e73..7e9ef1c 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value="报表对象",description = "报表对象") public class BrPojo extends BaseBean { + private static final long serialVersionUID = -8490788183629516155L; @Column(name="MASTER_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 9a055dd..5387dcd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象属性",description = "对象属性") public class BrPojoAttr extends BaseBean { + private static final long serialVersionUID = -9025365832485707583L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板编号" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java index bd1739c..b6f96b4 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilter.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="对象筛选器",description = "对象筛选器") public class BrPojoFilter extends BaseBean { + private static final long serialVersionUID = -6375751397050043457L; @Column(name="MASTER_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index cec0847..48971a1 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -33,6 +33,7 @@ import javax.persistence.Transient; @Api(value="对象筛选器",description = "对象筛选器") public class BrPojoFilterAttr extends BaseBean { + private static final long serialVersionUID = 7949763397771577851L; @Column(name="FILTER_ID") @ApiParam(value ="筛选器ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java index 58ce06c..e77eb9d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoView.java @@ -34,6 +34,7 @@ import java.util.List; @Api(value="对象视图",description = "对象视图") public class BrPojoView extends BaseBean { + private static final long serialVersionUID = 3796940669579576121L; @Column(name="POJO_ID") @ApiParam(value ="主对象ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java index 2b6ccaa..bc22d2d 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value = "对象视图", description = "对象视图") public class BrPojoViewAttr extends BaseBean { + private static final long serialVersionUID = -3080081514595597936L; @Column(name = "VIEW_ID") @ApiParam(value = "视图ID") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java index 5b2cb10..d94ec61 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-角色目录",description = "关系-角色目录") public class BrRefRoleMenu extends BaseBean { + private static final long serialVersionUID = 4474890758490483265L; @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) From 1d0030330662298de3bb57fdb0a7658d22a2c2df Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 1 Apr 2020 20:38:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-=E6=8A=98=E7=BA=BF=E5=9B=BE,=E9=A5=BC=E5=9B=BE,?= =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE,=E7=9F=A9=E5=BD=A2=E5=9B=BE=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 21 +++++++++++++++++++++ .../i3plus/pojo/model/report/TemplateModel.java | 2 +- .../i3plus/pojo/platform/platbean/SysLogSystem.java | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index 98dcfd7..f355b4b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -6,6 +6,7 @@ import com.mongodb.Block; import com.mongodb.client.MongoCollection; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; +import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.bson.conversions.Bson; import org.springframework.data.mongodb.core.MongoOperations; @@ -14,6 +15,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.regex.Pattern; /** @@ -248,6 +250,25 @@ public class BsonPackTool { } /** + * 查询方位分装 + * @param columnName 列名称 + * @param bson + * @param startTime 开始值 + * @param endTime 结束之 + * @return + */ + public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) { + if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){ + bson = Filters.and( + bson, + Filters.gte(columnName, startTime), //大于等于开始日期 + Filters.lte(columnName, endTime) //小于等于结束日期 + ); + } + return bson; + } + + /** * 大于日期 * @param dateTime 日期 * @param columnName HQL里对应的时间字段 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index 2a28c0f..c29a77b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -70,7 +70,7 @@ public class TemplateModel implements Serializable { private List> rows; @ApiParam(value = "跨服务调用解析后数据") - private Object option; + private String option; @ApiParam(value = "分页参数") private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java index 51447d5..5d81ed5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java @@ -91,4 +91,5 @@ public class SysLogSystem extends BaseBean { @ApiParam(value ="执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; + }