Merge remote-tracking branch 'origin/test' into test

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

@@ -20,19 +20,27 @@ public class MesEnumUtil {
         POJO_OBJECT(10,"实体对象（单表）"),
         DYNAMIC(20,"动态对象（生产数据表）");
 
-        private Integer objectType;
+        private Integer value;
         private String description;
-        SPC_KEY_DATA_OBJECT_TYPE(Integer objectType,String description ){
-            this.objectType = objectType;
+        SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){
+            this.value = value;
             this.description = description;
         }
+        public static String valueOfDesc(String val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    return values()[i].description;
+                }
+            }
+            return null;
+        }
 
-        public Integer getObjectType() {
-            return objectType;
+        public Integer getValue() {
+            return value;
         }
 
-        public void setObjectType(Integer objectType) {
-            this.objectType = objectType;
+        public void setValue(Integer value) {
+            this.value = value;
         }
 
         public String getDescription() {
@@ -5256,7 +5264,8 @@ public class MesEnumUtil {
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
-        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板");
+        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
+        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板");
 
         private String code;
         private String description;
@@ -7543,4 +7552,40 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * mes 看板展示类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SHOW_TYPE {
+
+        PICTURE(10, "图片"),
+        VIDEO(20, "视频");
+
+        private int value;
+        private String description;
+
+        SHOW_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;
+        }
+    }
 }

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

@@ -0,0 +1,44 @@
+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:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_CUSTOMER_DATA")
+@Api("MES_看板客户相关信息")
+public class MesBoardCustomerData extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 3871945569470777555L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "COMPLAIN_PLAN_QTY")
+    @ApiParam("客户抱怨目标数量")
+    private Integer complainPlanQty;
+
+    @Column(name = "COMPLAIN_ACTUAL_QTY")
+    @ApiParam("客户抱怨实际数量")
+    private Integer complainActualQty;
+}

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

@@ -0,0 +1,64 @@
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:47 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SUBMENU")
+@Api("MES_看板子菜单")
+public class MesBoardSubmenu extends BaseBean implements Serializable  {
+
+    private static final long serialVersionUID = 6544735793917822548L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "ITEM_NAME")
+    @ApiParam("子项名称")
+    private String itemName;
+
+    @Column(name = "ICON")
+    @ApiParam("ICO图标")
+    private String icon;
+
+    @Column(name = "SEQ")
+    @ApiParam("顺序号")
+    private Integer seq;
+
+    /**
+     * 10-图片  20-视频
+     */
+    @Column(name = "SHOW_TYPE")
+    @ApiParam("展示类型")
+    private Integer showType;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("图片路径")
+    private String pictureUrl;
+
+    @Column(name = "VIDEO_URL")
+    @ApiParam("视频路径")
+    private String videoUrl;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.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.MesBoardCustomerData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardCustomerDataRepository extends BaseRepository<MesBoardCustomerData, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.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.MesBoardSubmenu;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 8:53 下午
+ * @Modify:
+ */
+@Repository
+public interface MesBoardSubMenuRepository extends BaseRepository<MesBoardSubmenu, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2327,6 +2327,25 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) {
+        DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode());
+        if (!StringUtils.isEmpty(spcKeyData.getIsValid())) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getKdCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean);
+        }
+        if (spcKeyData.getObjectType() != null) {
+            DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) {
+            DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean);
+        }
+        return packBean;
+    }
     /**
      * 监听任务查询条件封装
      *

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-09-28 17:48
+ * @Modify:
+ **/
+@Data
+@ApiModel("适配记录模型")
+public class SuitRecordModel {
+
+    @ApiModelProperty("主记录")
+    private BsSuitRecord bsSuitRecord;
+
+    @ApiModelProperty("适配文件")
+    private BsSuitFile bsSuitFile;
+
+    public SuitRecordModel() {
+    }
+
+    public SuitRecordModel(BsSuitRecord bsSuitRecord, BsSuitFile bsSuitFile) {
+        this.bsSuitRecord = bsSuitRecord;
+        this.bsSuitFile = bsSuitFile;
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -41,6 +41,7 @@ public class SuitServerModel implements Serializable {
     private String requestId;
     // 传输单对象
     @XmlElement(name = "data")
+    @XStreamAlias("data")
     private Object obj;
     // 传输集合
     private List list;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java

@@ -123,6 +123,9 @@ public class BsSuitCaseFTP extends BaseBean {
     @Transient
     @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;
+    @Transient
+    @ApiParam(value = "临时适配路径")
+    private List<String> ftpFileList;
 
     @Transient
     @ApiParam(value = "适配文件列表")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java

@@ -85,4 +85,19 @@ public class BsSuitFile extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    public void setFtpPathInfo(String ftpPathInfo){
+        if(ftpPathInfo == null){
+            return;
+        }
+
+        int pathIdx = ftpPathInfo.lastIndexOf("/");
+        if (pathIdx == -1) {
+            this.setFolderPath("/");
+            this.setFileName(ftpPathInfo);
+        }else{
+            this.setFolderPath(ftpPathInfo.substring(0,pathIdx));
+            this.setFileName(ftpPathInfo.substring(pathIdx + 1));
+        }
+    }
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -128,6 +128,7 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
     @Column(name = "PROCESS_TIME")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -387,6 +387,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitFile.orderBy());
@@ -430,4 +431,13 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsSuitFile);
+        DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean);
+        return ddlPackBean;
+    }
 }