Merge branch 'test' into ext-dev

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

@@ -6585,4 +6585,43 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 用户登陆状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_LOGIN_STATUS {
+        ONLINE(10, "在线"),
+        OFFLINE(20, "离线");
+
+        private int value;
+        private String description;
+
+        USER_LOGIN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            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/MesNumberRule.java

@@ -54,13 +54,26 @@ public class MesNumberRule extends BaseBean implements Serializable {
 
     @Column(name = "SERIALNO_INCREMENT")
     @ApiParam("增量")
-    private Integer serialnoIncrement;
+    private Integer serialnoIncrement = 1;
+
+    @Column(name = "BEGIN_VAL")
+    @ApiParam("起始值")
+    private Integer beginVal = 1;
+
+    @Column(name = "END_VAL")
+    @ApiParam("最大值")
+    private Integer endVal;
 
     @Column(name = "IS_CYCLE")
     @ApiParam("最大值后循环")
     private Integer isCycle;
 
+    @Column(name = "IMPL_CLASS")
+    @ApiParam("最大值后不循环的实现类")
+    private String implClass;
+
     @Column(name = "SPILT_RULE")
-    @ApiParam("拼接规则")
+    @ApiParam("拼接固定字符,多个逗号分隔")
     private String spiltRule;
+
 }

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

@@ -71,4 +71,8 @@ public class MesPcnSysUserOffline extends BaseBean implements Serializable {
     @ApiParam(value ="模块" , access ="模块")
     private String moduleList;
 
+    @Column(name="STATUS")
+    @ApiParam(value ="状态" , access ="状态")
+    private Integer status;
+
 }

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

@@ -106,6 +106,9 @@ public class GenSerialNoModel {
     @ApiParam("颜色名称")
     private String colorName;
 
+    @ApiParam("拼接动态字符,多个逗号分隔")
+    private String dynamicRule;
+
 
     public GenSerialNoModel(String ruleCode) {
         this.ruleCode = ruleCode;

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/2/19 2:58 PM
+ * @Modify:
+ */
+@Data
+public class IfReportModel {
+
+    @ApiParam("接口表代码")
+    private String ifTableCode;
+
+    @ApiParam("接口表名称")
+    private String ifTableName;
+
+    @ApiParam("总数")
+    private Integer total;
+
+    @ApiParam("已同步数量")
+    private Integer alreadySync;
+
+    @ApiParam("未同步数量")
+    private Integer noSync;
+
+    @ApiParam("修改时间")
+    private String modifyDatetime;
+}