From 83be0e6f9124b0adfb5ad7c5877ca244e6f543ed Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 15 May 2022 14:13:23 +0800 Subject: [PATCH 1/5] andon --- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java | 2 +- .../java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java index ac70dd0..4303c7c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java @@ -21,7 +21,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ public String toString() { return "StationRequestBean{" + "actorReceiveStrategyClass='" + get(actorReceiveStrategyClass) + '\'' + - ", stationRequestBeanAbClass='" + get(stationRequestBeanAbClass) + '\'' + + ", actorClass='" + get(actorClass) + '\'' + ", fsmCachedKey='" + get(fsmCachedKey) + '\'' + ", organizeCode='" + get(organizeCode) + '\'' + ", userInfo='" + get(userInfo) + '\'' + diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java index 7039da7..e3797ef 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java @@ -23,8 +23,8 @@ public abstract class StationRequestBeanAb implements Serializable { @ApiParam("ACTOR接收策略类名") public String actorReceiveStrategyClass; - @ApiParam("工位请求bean子类") - public String stationRequestBeanAbClass; + @ApiParam("ACTOR类名") + public String actorClass; @ApiParam("缓存数据KEY") public String fsmCachedKey; From 772dcac79f1660e9526e42ce62f66d8e99c89383 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 16 May 2022 21:05:23 +0800 Subject: [PATCH 2/5] andon --- .../estsh/i3plus/pojo/andon/bean/AndonActionModule.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonActionModuleGroup.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonActionModuleParam.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java | 12 +++++------- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java | 11 +++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonAlarmDetailType.java | 13 +++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java | 15 ++++++++------- .../pojo/andon/bean/AndonAlarmRouteModuleParam.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java | 12 +++++------- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java | 7 ++++--- .../estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java | 11 +++++------ .../java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java | 11 +++++------ .../i3plus/pojo/andon/bean/AndonRouteModuleParam.java | 11 +++++------ .../cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java | 11 ++++------- .../cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java | 9 ++++++--- .../cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java | 10 ++++++---- .../cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 13 +++++++++++++ 19 files changed, 111 insertions(+), 104 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java index 7fe53f7..480064b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModule.java @@ -4,16 +4,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.annotation.Transient; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE") +@Table(name = "ANDON_ACTION_MODULE", indexes = { + @Index(columnList = "AM_CODE"), + @Index(columnList = "AM_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("作业组件") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java index a203e27..e550639 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleGroup.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE_GROUP") +@Table(name = "ANDON_ACTION_MODULE_GROUP", indexes = { + @Index(columnList = "AMG_ID"), + @Index(columnList = "AM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("组件集") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java index 1f38770..7739928 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionModuleParam.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,11 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_MODULE_PARAM") +@Table(name = "ANDON_ACTION_MODULE_PARAM", indexes = { + @Index(columnList = "AM_CODE"), + @Index(columnList = "PARAM_CODE"), + @Index(columnList = "AM_CODE, PARAM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("组件参数") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java index 85e0253..c8730c9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActionRoute.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTION_ROUTE") +@Table(name = "ANDON_ACTION_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("作业流程") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java index 242b401..4264c2b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActor.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTOR") +@Table(name = "ANDON_ACTOR", indexes = { + @Index(columnList = "ACTOR_CODE"), + @Index(columnList = "ACTOR_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR信息") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java index 9001d81..a12b327 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonActorRule.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ACTOR_RULE") +@Table(name = "ANDON_ACTOR_RULE", indexes = { + @Index(columnList = "ACTOR_CODE"), + @Index(columnList = "MT_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("ACTOR消息类型配置") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index 1dd3267..9ef65fb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -6,15 +6,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,12 @@ import java.io.Serializable; **/ @Data @Entity -@Table(name="ANDON_ALARM_DETAIL_TYPE") +@Table(name = "ANDON_ALARM_DETAIL_TYPE", indexes = { + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "ALARM_DETAIL_CODE"), + @Index(columnList = "ALARM_DETAIL_NAME"), + @Index(columnList = "ALARM_CODE, ALARM_DETAIL_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java index 3b1b0c8..6135b57 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRoute.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,13 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_ROUTE") +@Table(name = "ANDON_ALARM_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "ROUTE_CODE, ALARM_CODE"), + @Index(columnList = "ROUTE_CODE, ALARM_CODE, WORK_CENTER_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程配置") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java index 15163b4..3537dfb 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmRouteModuleParam.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,11 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ALARM_ROUTE_MODULE_PARAM", indexes = { + @Index(columnList = "ALARM_ROUTE_ID"), + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ALARM_ROUTE_ID, ROUTE_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯作业流程组件参数") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 4d777cc..98f8e1e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ALARM_TYPE") +@Table(name = "ANDON_ALARM_TYPE", indexes = { + @Index(columnList = "ALARM_CODE"), + @Index(columnList = "ALARM_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java index 5ac57e8..c7bbf8d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonArea.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -12,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯区域 @@ -27,7 +25,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="ANDON_AREA") +@Table(name = "ANDON_AREA", indexes = { + @Index(columnList = "AREA_CODE"), + @Index(columnList = "AREA_NAME") +}) @Api("安灯区域") public class AndonArea extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java index ee0d921..02cb2c5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -25,7 +21,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_AREA_ALARM_TYPE") +@Table(name = "ANDON_AREA_ALARM_TYPE", indexes = { + @Index(columnList = "AREA_CODE"), + @Index(columnList = "ALARM_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("区域安灯类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java index fd777b6..f6bdeaa 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java @@ -4,15 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -28,7 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="ANDON_CONFIG") +@Table(name = "ANDON_CONFIG", indexes = { + @Index(columnList = "CONFIG_CODE"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY"), + @Index(columnList = "CONFIG_CODE, CONFIG_KEY, CONFIG_GROUP") +}) @Api(value="系统配置") public class AndonConfig extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java index cac7d25..caee751 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageType.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_MESSAGE_TYPE") +@Table(name = "ANDON_MESSAGE_TYPE", indexes = { + @Index(columnList = "MT_CODE"), + @Index(columnList = "MT_NAME") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("消息类型") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java index ae11cf7..1bf913e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteModuleParam.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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.*; import java.io.Serializable; /** @@ -26,7 +22,10 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ROUTE_MODULE_PARAM") +@Table(name = "ANDON_ROUTE_MODULE_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, AMG_ID, AM_CODE, STATUS_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("流程组件参数") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java index 6713197..9d3f63c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatus.java @@ -5,16 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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 javax.persistence.*; import java.io.Serializable; /** @@ -27,7 +22,9 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate -@Table(name = "ANDON_ROUTE_STATUS") +@Table(name = "ANDON_ROUTE_STATUS", indexes = { + @Index(columnList = "ROUTE_CODE") +}) @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) @Api("流程状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java index a65ca72..18935de 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCell.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯工作单元 @@ -26,7 +24,12 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "ANDON_WORK_CELL") +@Table(name = "ANDON_WORK_CELL", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "WORK_CELL_NAME"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("安灯工作单元") public class AndonWorkCell extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java index cdfc419..e92ddbf 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.andon.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :安灯工作中心 @@ -26,7 +24,12 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "ANDON_WORK_CENTER") +@Table(name = "ANDON_WORK_CENTER", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_NAME"), + @Index(columnList = "AREA_CODE"), + @Index(columnList = "AREA_CODE, WORK_CENTER_CODE") +}) @Api("安灯工作中心") public class AndonWorkCenter extends BaseBean implements Serializable { @@ -40,7 +43,6 @@ public class AndonWorkCenter extends BaseBean implements Serializable { @ApiParam("工作中心名称") private String workCenterName; - @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 86135c1..9c713e1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -1247,5 +1247,18 @@ public class AndonHqlPack { return packBean; } + /** + * Andon工作中心信息查询条件封装 + * @param workCenter + * @return + */ + public static DdlPackBean getAllCenter(AndonWorkCenter workCenter) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCenter.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(workCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringEqualPack(workCenter.getAreaCode(), "areaCode", packBean); + return packBean; + } + } From 55cc12c01a6039783d770616470e9cb90d49744d Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 18 May 2022 09:38:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Eandon=E6=9F=A5=E8=AF=A2co?= =?UTF-8?q?re=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/AndonQueryUserModel.java | 27 ++++++++++++++++++++ .../model/platform/AndonQueryUserResultModel.java | 29 ++++++++++++++++++++++ .../model/platform/DingSendBatchRequestModel.java | 4 ++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java new file mode 100644 index 0000000..2d6bf63 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:38 + * andon 查询用户信息model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("andon 调用core查询的model") +public class AndonQueryUserModel { + @ApiModelProperty(value ="工厂代码" , access ="工厂代码") + private String organizeCode; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String userLoginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java new file mode 100644 index 0000000..62405be --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:39 + * 松下andon 查询结果返回model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("根据条件查询数据返回给andon的结果") +public class AndonQueryUserResultModel { + @ApiModelProperty(value ="用户账号id" , access ="用户账号id") + private Long userId; + @ApiModelProperty(value ="用户信息id" , access ="用户信息id") + private Long userInfoId; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String loginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java index 0f1cf1a..55de6ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java @@ -19,7 +19,9 @@ import java.util.List; public class DingSendBatchRequestModel { @ApiModelProperty(value ="手机号" , access ="手机号") - private List phoneNumberList ; + private List phoneNumberList; + @ApiModelProperty(value ="账号登录名列表" , access ="账号登录名列表") + private List userLoginNameList ; @ApiModelProperty(value ="消息标题" , access ="消息标题") private String title ; @ApiModelProperty(value ="消息内容" , access ="消息内容") From 6e47adcdd2a6172183628fca499ba70c1103e445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Wed, 18 May 2022 17:48:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?MesQueueOrderDetai=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 379048c..bfcda35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -147,6 +147,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("回冲标识") private String jisBackflushStatus; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private String qcStatus; + @Transient @ApiParam("Vin") private String vinCode; From 05331ea5de973ce97755a7150cf19781c35aef91 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 May 2022 20:18:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 3 -- .../i3plus/pojo/andon/model/ModuleResult.java | 63 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 1c5d24a..6197372 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,7 +69,4 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; - @ApiParam("下个触发事件") - private String nextTriggerEvent; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java new file mode 100644 index 0000000..bc8c717 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("组件返回信息") +public class ModuleResult { + + private boolean isCompleted; + + private String msg; + + private String nextTriggerEvent; + + public static ModuleResult getNonComplete() { + return new ModuleResult(false, ""); + } + + public static ModuleResult getNonComplete(String msg) { + return new ModuleResult(false, msg); + } + + public static ModuleResult getCustomNonComplete(String nextTriggerEvent) { + return new ModuleResult(false, "", nextTriggerEvent); + } + + public static ModuleResult getCustomNonComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(false, msg, nextTriggerEvent); + } + + public static ModuleResult getSuccessComplete() { + return new ModuleResult(true, ""); + } + + public static ModuleResult getSuccessComplete(String msg) { + return new ModuleResult(true, msg); + } + + public static ModuleResult getCustomSuccessComplete(String nextTriggerEvent) { + return new ModuleResult(true, "", nextTriggerEvent); + } + + public static ModuleResult getCustomSuccessComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(true, msg, nextTriggerEvent); + } + + private ModuleResult() { + } + + private ModuleResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + +}