设备报警 mes端完成

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmContinuousConfig.java

@@ -0,0 +1,50 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/27 15:59
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE")
+})
+@Api("节拍故障等级配置表")
+public class MesTaktAlarmContinuousConfig extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1046263075313178823L;
+
+    @Column(name = "WORK_CETNER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "CONTINUOUS_DETERMINE")
+    @ApiParam("连续判断的等级代码")
+    private String continuousDetermine;
+
+    @Column(name = "CONTINUOUS_SECOND")
+    @ApiParam("连续秒数")
+    private Integer continuousSecond;
+
+    @Column(name = "CONTINUOUS_COUNT")
+    @ApiParam("发生次数")
+    private Integer continuousCount;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmLevelConfig.java

@@ -0,0 +1,62 @@
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/27 15:59
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TAKT_LEVEL_CONFIG", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE")
+})
+@Api("节拍故障等级配置表")
+public class MesTaktAlarmLevelConfig extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3550230985173772736L;
+
+    @Column(name = "WORK_CETNER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "LEVEL_CODE")
+    @ApiParam("等级代码")
+    private String levelCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+
+    @Column(name = "IS_STOP_LINE")
+    @ApiParam("是否停线")
+    private Integer isStopLine;
+
+    @Column(name = "IS_TRIGGER_ANDON")
+    @ApiParam("是否触发安灯")
+    private Integer isTriggerAndon;
+
+    @Column(name = "MIN_MULTIPLE")
+    @ApiParam("最小倍数")
+    private Double minMultiple;
+
+    @Column(name = "MAX_MULTIPLE")
+    @ApiParam("最大倍数")
+    private Double maxMultiple;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTaktAlarmRecord.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Index;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/27 15:59
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TAKT_ALARM_RECORD", indexes = {
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "START_TIME")
+})
+@Api("节拍故障报警记录")
+public class MesTaktAlarmRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3267756779912298635L;
+
+    @Column(name = "WORK_CETNER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name = "END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Column(name = "TAKT_SECOND")
+    @ApiParam("节拍 秒数")
+    private Integer taktSecond;
+
+    @Column(name = "IS_ABNORMAL")
+    @ApiParam("是否异常")
+    private Integer isAbnormal = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -126,7 +127,7 @@ public class StationRequestBean implements Serializable {
     private String queueGroupNo;
 
     @ApiParam("数据map")
-    private Map<String, Object> dataMap = new HashMap<>();
+    private Map<String, Object> dataMap = new LinkedHashMap<>();
 
     @ApiParam("流程状态集合")
     private List<MesStateMachineStatus> fsmStates;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TaktAlarmCacheModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import com.google.common.cache.Cache;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/27 20:11
+ * @desc
+ */
+@Data
+public class TaktAlarmCacheModel {
+
+    private List<String> levelCode;
+
+    private Cache<Long, String> cache;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmContinuousConfigRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmContinuousConfig;
+
+/**
+ * @Description :节拍连续异常配置表
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesTaktAlarmContinuousConfigRepository extends BaseRepository<MesTaktAlarmContinuousConfig, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmLevelConfigRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmLevelConfig;
+
+/**
+ * @Description :节拍故障等级配置表
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesTaktAlarmLevelConfigRepository extends BaseRepository<MesTaktAlarmLevelConfig, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTaktAlarmRecordRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesTaktAlarmRecord;
+
+/**
+ * @Description :节拍故障记录表
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-03-06 10:57 上午
+ * @Modify:
+ **/
+public interface MesTaktAlarmRecordRepository extends BaseRepository<MesTaktAlarmRecord, Long> {
+}