Finish Task #2064 Cost:24h

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -5091,7 +5091,8 @@ public class MesEnumUtil {
     public enum BOARD_TYPE {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
-        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
+        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
+        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
 
         private String code;
         private String description;

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+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.io.Serializable;
+
+/**
+ * @Description : MES_看板工位信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_BOARD_WORK_CELL")
+@Api("MES_看板工位信息")
+public class MesBoardWorkCell extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 6251886604848913685L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "X_AXES")
+    @ApiParam("横坐标")
+    private Double xAxes = 0d;
+
+    @Column(name = "Y_AXES")
+    @ApiParam("纵坐标")
+    private Double yAxes = 0d;
+
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工位IP")
+    private String workCellIp;
+
+    @Transient
+    @ApiParam("看板工位状态")
+    private Boolean boardWorkCellStatus;
+
+    @JsonProperty("xAxes")
+    public Double getxAxes() {
+        return xAxes;
+    }
+
+    public void setxAxes(Double xAxes) {
+        this.xAxes = xAxes;
+    }
+
+    @JsonProperty("yAxes")
+    public Double getyAxes() {
+        return yAxes;
+    }
+
+    public void setyAxes(Double yAxes) {
+        this.yAxes = yAxes;
+    }
+
+    public double getXAxes() {
+        return this.xAxes == null ? 0.0d : this.xAxes;
+    }
+
+    public double getYAxes() {
+        return this.yAxes == null ? 0.0d : this.yAxes;
+    }
+}

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

@@ -1,9 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
-import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
-import cn.estsh.i3plus.pojo.mes.bean.MesOee;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +38,9 @@ public class BoardModel {
     @ApiParam("看板图片路径")
     private String pictureUrl;
 
+    @ApiParam("当天停机时间(min)")
+    private String theDayShutDownTime;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
 
@@ -52,4 +52,7 @@ public class BoardModel {
 
     @ApiParam("oee")
     private List<MesOee> oeeList;
+
+    @ApiParam("工位状态监控明细")
+    private List<MesBoardWorkCell> boardWorkCellList;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardWorkCellRepository.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.MesBoardWorkCell;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: adair.song
+ * @Date: 2020/06/04 13:23
+ * @Modify:
+ */
+@Repository
+public interface MesBoardWorkCellRepository extends BaseRepository<MesBoardWorkCell, Long> {
+}