diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index af0d7e3..7a4d706 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2133,4 +2133,51 @@ public class BlockFormEnumUtil { } } + + /** + * 操作触发来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FORM_TRIGGER_SOURCE { + INTERCEPTOR(10, "拦截器"), + BUTTON(20, "按钮"); + + private int value; + private String description; + + private FORM_TRIGGER_SOURCE (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; + } + + public static FORM_TRIGGER_SOURCE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + } 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-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..5dbc9ec 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 @@ -1483,6 +1483,50 @@ public class CommonEnumUtil { } /** + * 缺失资源来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MiSS_RESOURCE_SOURCE { + WEB(10, "网页端"), + SERVER(20, "服务端"); + + private int value; + private String description; + + private MiSS_RESOURCE_SOURCE(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; + } + + public static MiSS_RESOURCE_SOURCE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** * 属性类型信息(属性转换器) * *
Form 核心转换器 @@ -1871,4 +1915,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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index c08db39..8e46651 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,6 +13,74 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 排序方式 + */ + public enum ASC_OR_DESC { + ASC(1, "正序"), DESC(2, "倒序"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private ASC_OR_DESC(int value, String description) { + this.value = value; + this.description = 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; + } + } + + /** + * 监听任务明细-采集数据方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_DETAIL_COLLECT_TYPE { + SELF_ADDITION(10, "自增列"), + FEED_FIELD(20, "反馈字段"); + + private int value; + private String description; + + MONITOR_TASK_DETAIL_COLLECT_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; + } + } + + /** * 动作-module */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1812,18 +1880,18 @@ public class MesEnumUtil { } /** - * mes设备作业通知配置-通知方式 + * mes通知配置-通知方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { + public enum NOTIFY_CFG_PATTERN { - EMAIL(10, "邮件"), - USERPHONE(20, "手机号"); + EMAIL(10, "邮件"); +// USERPHONE(20, "手机号"); private int value; private String description; - MES_EQU_TASK_NOTIFY_CFG_PATTERN(int value, String description) { + NOTIFY_CFG_PATTERN(int value, String description) { this.value = value; this.description = description; } @@ -4164,8 +4232,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 19a03d8..16034b1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3126,7 +3126,7 @@ public class MesPcnEnumUtil { } /** - * mes_设备工装类型 + * mes_设备工装类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EQUIPMENT_TOOLING_TOOLING_TYPE { @@ -3270,6 +3270,108 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_EVENT { + TRIGGER(10, "trigger", "触发"), + ENTRY(20, "entry", "进入状态"), + EXIT(30, "exit", "离开状态"); + + private int value; + private String code; + private String description; + + private FSM_EVENT(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FSM_STATE_TYPE { + BEGIN(10, "begin", "开始状态点"), + END(20, "end", "结束状态点"); + + private int value; + private String code; + private String description; + + private FSM_STATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return this.value; + } + + public String getCode() { + return this.code; + } + + public String getDescription() { + return this.description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_REQUEST_BEAN_CMD { + JUMP_STATUS(10, "跳过状态点"), + FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点"); + + private int value; + private String description; + + STATION_REQUEST_BEAN_CMD(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 容器使用状态 */ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0cd86dd..383366a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3915,6 +3915,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PRINT_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** 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-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-mes jar + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java new file mode 100644 index 0000000..f422957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataWarning.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2020/04/03 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_WARNING") +@Api("数据预警配置") +public class MesDataWarning extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8328008752104417017L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "WARNING_RULE") + @ApiParam("预警规则") + private String warningRule; + + @Column(name = "CHECK_TIME") + @ApiParam("校验时间") + private String checkTime; + + @Column(name = "QTY") + @ApiParam("数据量最大限制(分钟)") + private Integer qty; + + @Column(name = "WARNING_ITEM") + @ApiParam("预警内容项") + private String warningItem; + + @Column(name = "INFORM_MODE") + @ApiParam("通知方式") + private Integer informMode; + + @Lob + @Column(name = "INFORM_USER") + @ApiParam("通知对象") + private String informUser; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index fba3a8d..b573418 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -26,7 +26,7 @@ import java.io.Serializable; }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) -@Api("包装规格") +@Api("包装表") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java index 13e8069..7fbe7f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -53,7 +53,7 @@ public class MesPartCheck extends BaseBean implements Serializable { private String recordNumSpelExpress; @Column(name = "RECORD_NUM_DESC") - @ApiParam("校验表达式") + @ApiParam("校验表达式描述") private String recordNumDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java new file mode 100644 index 0000000..cb0457f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:58 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_CFG_DETAIL") +@Api("MES_散件配置报文关系") +public class MesScatterCfgDetail extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 90bcbf9..421dbcb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -10,8 +10,8 @@ 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.io.Serializable; /** @@ -57,19 +57,31 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("触发条件") private String triggerWhere; - @Column(name = "ACTION_AMG_ID") + @Column(name = "TRIGGER_AMG_ID") @ApiParam("触发调用") - private Integer actionAmgId; + private Long triggerAmgId; @Column(name = "IN_AMG_ID") @ApiParam("进入调用") - private Integer inAmgId; + private Long inAmgId; @Column(name = "OUT_AMG_ID") @ApiParam("离开调用") - private Integer outAmgId; + private Long outAmgId; @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") @ApiParam("状态类型 10=初始化状态") private Integer statusType; + + @Transient + @ApiParam("状态点是否完成") + private boolean isComplete; + + @Transient + @ApiParam("状态点是否完成") + private boolean isJump; + + @Transient + @ApiParam("前端显示颜色") + private String color; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java similarity index 83% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index 314f526..48bfc7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -23,18 +23,18 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_MODULE_GROUP") +@Table(name = "MES_STEP_GROUP") @Api("工步集") -public class MesActionModuleGroup extends BaseBean implements Serializable { +public class MesStepGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 1876053661752102998L; @Column(name = "AMG_ID") @ApiParam("组件集编号") private Long amgId; - @Column(name = "AM_CODE") + @Column(name = "STEP_CODE") @ApiParam("组件集代码") - private String amCode; + private String stepCode; @Column(name = "SEQ") @ApiParam("执行顺序") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java new file mode 100644 index 0000000..2deb16a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.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 java.io.Serializable; + +/** + * @Description :MES工装明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_DETAIL") +@Api("MES_工装明细") +public class MesToolingDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5033127912653649665L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 809f29c..d97a57a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -18,8 +18,16 @@ public class CellFeedModel { private String partNo; + private String partName; + private String itemPartNo; - private String qty; + private String itemPartName; + + private String shouldQty; + + private String remainQty; + + private String scanQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java new file mode 100644 index 0000000..e7e176f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FsmStatusModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/30 22:18 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FsmStatusModel { + + private String from; + + private String to; + + private String event; + + private Object context; + + private String status; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 845d2bf..28b8235 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -34,6 +34,24 @@ public class GenSerialNoModel { @ApiParam("客户代码") private String custCode; + @ApiParam("年") + private String year; + + @ApiParam("月") + private String month; + + @ApiParam("日") + private String day; + + @ApiParam("时") + private String hour; + + @ApiParam("分") + private String minute; + + @ApiParam("秒") + private String second; + @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java new file mode 100644 index 0000000..b15294e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentToolingModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : MES_设备工装关系Model + * @Reference : + * @Author :qianhuasheng + * @CreateDate : 2020-04-02 16:34 + * @Modify: + **/ +@Data +@Api("MES_设备工装关系Model") +public class MesEquipmentToolingModel implements Serializable { + + private static final long serialVersionUID = 1947971352179107711L; + + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("工装编号") + private String toolingNo; + + @ApiParam("工装代码") + private String toolingCode ; + + @ApiParam("工装名称") + private String toolingName; + + @ApiParam("工装类型") + private Integer toolingType; + + @ApiParam("使用次数") + private Integer useCount; + + @ApiParam("更换开始时间") + private String startTime; + + @ApiParam("更换结束时间") + private String endTime; + + @Transient + @ApiParam("最大次数") + private Integer useCountMax; + + public MesEquipmentToolingModel(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } + public MesEquipmentToolingModel() { + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java similarity index 96% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 49202fa..9a5b3a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java @@ -29,7 +29,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Api("用户信息model") -public class EquTaskNotifyUserModel extends BaseBean { +public class NotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") private Long userInfoId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 60d0f9e..2d3d15c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("队列编号") private String orderNo; + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; public QueueOrderModel() { } @@ -90,7 +92,7 @@ public class QueueOrderModel implements Serializable { } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -102,8 +104,8 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; + this.finsihQty = finsihQty; + this.qty = qty; } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -120,8 +122,9 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType, Double finsihQty, Double qty) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -133,12 +136,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -151,18 +154,38 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.snStatus = snStatus; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; + this.isGroupPrinted = isGroupPrinted; + } + + public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) { + + public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType, Double finsihQty, Double qty) { + this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -172,12 +195,12 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.finsihQty=finsihQty; - this.qty=qty; - this.orderNo=orderNo; + this.finsihQty = finsihQty; + this.qty = qty; + this.orderNo = orderNo; } - public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -188,6 +211,19 @@ public class QueueOrderModel implements Serializable { this.partNo = partNo; this.partNameRdd = partNameRdd; this.workType = workType; - this.orderNo=orderNo; + this.orderNo = orderNo; + this.serialNumber=serialNumber; + } + //料架分组队列展示组件 + public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.orderNo = orderNo; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.organizeCode = organizeCode; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d1e1299..21d65dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -63,11 +64,20 @@ public class StationRequestBean implements Serializable { @ApiParam("按钮编号") private String buttonCode; + @ApiParam("状态代码") + private String statusCode; + @ApiParam("工步代码") private String stepCode; + @ApiParam("工步序号") + private Integer stepSeq; + @ApiParam("强制执行工步代码") private String forceSpecStepCode; + + @ApiParam("强制执行状态点代码") + private String forceSpecStatusCode; /** * doScan-扫描，doModule-处理组件,initModule-初始化组件 */ @@ -102,13 +112,16 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap=new HashMap<>(); + private Map dataMap = new HashMap<>(); @ApiParam("流程状态集合") - private List routeStatusList; + private List fsmStates; @ApiParam("当前流程状态") - private MesRouteStatus curRouteStatus; + private MesStateMachineStatus curFsmState; + + @ApiParam("展示组件") + private Object moduleService; @Override public String toString() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java new file mode 100644 index 0000000..244c7f1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestCmdBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/31 18:41 + * @desc + */ +@Data +public class StationRequestCmdBean { + + private StationRequestBean requestBean; + + private MesPcnEnumUtil.STATION_REQUEST_BEAN_CMD cmd; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 7636eae..8adee52 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -66,11 +66,13 @@ public class StepModel implements Serializable { */ @ApiParam("工步是否跳过") private boolean isJump; + /** * 参数代码 */ @ApiParam("参数代码") private String paramCode; + /** * 工作单元代码 */ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 22d2fa3..77c8985 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -18,26 +18,52 @@ public class StepResult { private String msg; - public static StepResult getSuccessComplete() { - return new StepResult(true,""); - } + private StationRequestBean stationRequestBean; public static StepResult getNonComplete() { - return new StepResult(false,""); + return new StepResult(false, ""); } - public static StepResult getSuccessComplete(String msg) { - return new StepResult(true, msg); + public static StepResult getNonComplete(StationRequestBean requestBean) { + return new StepResult(false, ""); + } + + public static StepResult getNonCompleteData(T data, String msg) { + return new StepResult(false, data, msg); + } + + public static StepResult getNonCompleteReqBean(StationRequestBean reqBean) { + return new StepResult(false, reqBean); + } + + public static StepResult getNonCompleteData(T data) { + return new StepResult(false, data, ""); } public static StepResult getNonComplete(String msg) { return new StepResult(false, msg); } + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getSuccessComplete() { + return new StepResult(true, ""); + } + + public static StepResult getSuccessCompleteReqBean(StationRequestBean reqBean) { + return new StepResult(true, reqBean); + } + public static StepResult getSuccessData(T data, String msg) { return new StepResult<>(true, data, msg); } + public static StepResult getSuccessData(T data) { + return new StepResult<>(true, data, ""); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); } @@ -54,6 +80,12 @@ public class StepResult { this.msg = msg; } + + public StepResult(boolean isCompleted, StationRequestBean stationRequestBean) { + this.isCompleted = isCompleted; + this.stationRequestBean = stationRequestBean; + } + public StepResult(boolean isCompleted, T data, String msg) { this.isCompleted = isCompleted; this.data = data; @@ -66,4 +98,11 @@ public class StepResult { this.msg = msg; } + public StepResult(boolean isCompleted, T data, Collection dataCollection, String msg, StationRequestBean stationRequestBean) { + this.isCompleted = isCompleted; + this.data = data; + this.dataCollection = dataCollection; + this.msg = msg; + this.stationRequestBean = stationRequestBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java new file mode 100644 index 0000000..54da78e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataWarningRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataWarning; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesDataWarningRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.java new file mode 100644 index 0000000..67c4a3f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStatusRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 5d5916a..b408ff1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2175,9 +2175,15 @@ public class MesHqlPack { if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); } + if (!StringUtils.isEmpty(monitorTaskDetail.getStoreObjectCode())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getStoreObjectCode(), "storeObjectCode", packBean); + } if (monitorTaskDetail.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); } + if (monitorTaskDetail.getCollectType() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getCollectType(), "collectType", packBean); + } return packBean; } @@ -2283,4 +2289,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 数据预警配置 + * @param dataWarning + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDataWarning(MesDataWarning dataWarning, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(dataWarning, organizeCode); + if(!StringUtils.isEmpty(dataWarning.getObjectCode())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getObjectCode(), "objectCode", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningRule())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningRule(), "warningRule", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getWarningItem())){ + DdlPreparedPack.getStringLikerPack(dataWarning.getWarningItem(), "warningItem", packBean); + } + if(!StringUtils.isEmpty(dataWarning.getInformMode())){ + DdlPreparedPack.getNumEqualPack(dataWarning.getInformMode(), "informMode", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java new file mode 100644 index 0000000..edd899b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 表单操作数据模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-02 10:22 + * @Modify: + **/ +@Data +@ApiModel("表单操作数据模型") +@NoArgsConstructor +public class FormOperateDataModel { + + @ApiModelProperty("元素代码") + private Long refId; + + @ApiModelProperty("元素名称") + private String refName; + + @ApiModelProperty("操作来源") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.FORM_TRIGGER_SOURCE.class) + private String triggerSource; + + @ApiModelProperty("来源名称") + private String sourceName; + + @ApiModelProperty("操作数据集合") + private List> operateDataList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java new file mode 100644 index 0000000..aa7c6a6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 缺失资源 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-01 09:31 + * @Modify: + **/ +@Data +public class MissResourceModel implements Serializable { + + private static final long serialVersionUID = 677360677490162891L; + + @ApiParam(value = "主键") + @AnnoOutputColumn + private String key; + + @ApiParam(value = "产品类型", example = "0", access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, required = false) + private Integer softType; + + @AnnoOutputColumn(refClass = CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.class) + @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") + private Integer resourceType; + + @ApiParam(value = "语言编码", example = "浏览器语言编码") + @AnnoOutputColumn + private String languageCode; + + @ApiParam(value = "资源KEY") + @AnnoOutputColumn + private String resourceKey; + + @ApiParam(value = "资源Value") + @AnnoOutputColumn + private String resourceValue; + + @ApiParam(value = "数据来源") + @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class) + private Integer resourceSource; + + @ApiParam(value = "数据来源") + @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class) + private Integer isValid; + +} 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-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/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 3a9268b..f0f7fb2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -1,12 +1,15 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; 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; @@ -43,6 +46,7 @@ public class SysConfig extends BaseBean { // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP @Column(name="CONFIG_GROUP") @ApiParam(value ="参数组") + @AnnoOutputColumn(refClass = ImppEnumUtil.SYS_CONFIG_GROUP.class) private Integer configGroup; // 枚举 ImppEnumUtil.SYS_VALUE_TYPE diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index f8b4f4e..17ac6d6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -37,9 +37,6 @@ public class SysLocaleResource extends BaseBean { private Integer resourceType; @Transient - private String resourceTypes; - - @Transient private String resourceTypeTxt; public String getResourceTypeTxt(){ @@ -87,4 +84,10 @@ public class SysLocaleResource extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; + /** + * 检索条件 + */ + @Transient + private String resourceTypes; + } 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; 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; + } 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); - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 7891cdb..cc0e5e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -754,7 +754,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); if (orderNoRule.getSerialNo() != null) { - DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result); + DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "serialNo", result); } // 添加默认排序 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/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..8fd65cc --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutElement.java @@ -0,0 +1,77 @@ +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 { + + private static final long serialVersionUID = 3684811659039862857L; + @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/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/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/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) 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; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index f235943..3657a64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -49,7 +49,7 @@ public class WmsBusiType extends BaseBean { public Integer moveType; /** - * 是否启用波次计划 10-是，20-否 + * 是否启用波次计划 1-是，2-否 */ @Column(name = "IS_ENABLE_WAVE") @ApiParam("是否启用波次计划") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f9e000a..e048183 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "集装箱号") private String containerNo; + @Transient + @ApiParam(value = "箱数") + private Integer boxQty; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ef16765..61cb767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -28,10 +28,10 @@ import java.math.BigDecimal; @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @Index(columnList = "ITEM_STATUS") -}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}) +}) +// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})} @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { - private static final long serialVersionUID = 2938720878619662102L; @Column(name = "ORDER_NO") @ApiParam(value = "单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java index 5c91192..d34d0e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -44,7 +44,7 @@ public class WmsTransportRule extends BaseBean { @Column(name = "BUSI_SCENE_TYPE") @ApiParam("业务场景") - //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") public Integer busiSceneType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index 8f0336a..5b43149 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; /** @@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault; * @Modify: **/ @Data +@NoArgsConstructor @AllArgsConstructor @Api("移库单数据模型") public class WmsDocMovementModel { @@ -43,7 +45,7 @@ public class WmsDocMovementModel { private String partGroupNo; @ApiParam("订单状态") - private String orderStatus; + private Integer orderStatus; @ApiParam(value = "优先级", example = "1") public Integer priority; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 06bf167..17793d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2590,7 +2590,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); +// DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); getStringBuilderPack(wmsPrintingQueue, result);