Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

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,10 +1880,10 @@ 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, "手机号");
@@ -1823,7 +1891,7 @@ public class MesEnumUtil {
         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;

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;
+
+}

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;
 
 }

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;

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<MesDataWarning, Long> {
+}

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;
+    }
 }