Merge branch 'test' into ext-dev

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

@@ -200,4 +200,230 @@ public class BspEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 心跳状态 1存活，2死掉
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum HEART_BEAT {
+        UP(1, "UP"),
+        DOWN(2, "DOWN");
+
+        private int value;
+        private String description;
+
+        HEART_BEAT(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;
+        }
+    }
+
+
+    /**
+     * 心跳状态 1存活，2死掉
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REGISTRY_TYPE {
+        MANUAL(1, "MANUAL"),
+        AUTO(2, "AUTO");
+
+        private int value;
+        private String description;
+
+        REGISTRY_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;
+        }
+    }
+
+
+    /**
+     * 软件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SOFT_TYPE {
+        /**
+         * WMS 服务
+         */
+        WMS(3, "i3wms", "仓库管理软件"),
+        SWEB(7,"i3sweb", "供应商服务"),
+        QMS(5, "i3qms", "质量管理软件"),
+        TMS(101, "i3tms", "运输管理系统"),
+        /**
+         * Mes 服务
+         */
+        MES(4,  "i3mes", "生产管理软件"),
+        MES_HISTORY(41,"i3mes-history","生产管理软件历史数据"),
+        MES_PCN(6,  "i3mes-pcn", "生产管理软件-节点中心"),
+        /**
+         * PTL 服务
+         */
+        PTL(8,  "i3ptl", "亮灯自动拣选"),
+        PTL_PCN(9,  "i3ptl-pcn", "亮灯自动拣选-节点中心"),
+        /**
+         * Block 服务
+         */
+        FORM(20,  "block-form", "智能表单"),
+        REPORT(21,  "block-report", "智能报表"),
+        WORKFLOW(22, "block-workflow", "智能工作流"),
+        JOBFLOW(23,  "block-jobflow", "智能作业流"),
+        SOFTSWITCH(24, "block-softswitch", "软件适配器"),
+        HARDSWITCH(25, "block-hardswitch", "硬件适配器"),
+        /**
+         * LAC 服务
+         */
+        LAC(26, "lac", "连接适配器"),
+        /**
+         * 安灯服务
+         */
+        ANDON(27, "andon", "安灯"),
+        /**
+         * 计划排产服务
+         */
+        APS(28,  "i3aps", "高级计划与排产"),
+        APS_2(18, "i3aps-2", "高级计划与排产-2"),
+        APS_3(38,  "i3aps-3", "高级计划与排产-3"),
+        APS_4(48,  "i3aps-4", "高级计划与排产-4"),
+        SURFACE(98, "i3surface", "对外服务"),
+        EAM(108,  "eam", "设备信息管理服务"),
+        /**
+         * 基础服务
+         */
+        IMPP(1,  "impp-platform", "IMPP平台"),
+        CLOUD(97, "i3cloud", "微服务"),
+        SCREEN(100,  "i3screen", "通用界面"),
+        /**
+         * 平台服务
+         */
+        CORE(2,  "i3core", "i3业务平台"),
+        MDM(29,  "i3mdm", "数据中心MDM"),
+        /**
+         * 调试服务
+         */
+        DEV(9999,  "Development", "系统调试"),
+        /**
+         * 智能调度系统
+         */
+        LEO(50,  "impp-leo", "智能调度系统");
+        /**
+         * 产品ID
+         */
+        private int value;
+        /**
+         * 产品代码
+         */
+        private String code;
+        /**
+         * 产品描述
+         */
+        private String description;
+
+        SOFT_TYPE(int value,  String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+
+
+        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;
+        }
+
+        public synchronized static int descriptionOfValue(String desc) {
+            int tmp = IMPP.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                    break;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = IMPP.value;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name().equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Api("执行器注册的信息")
 public class RegistryParam  implements Serializable {
     @ApiParam("执行器的名称")
-    private String appname;
+    private Integer appType;
     @ApiParam("执行器的地址")
     private String address;
     @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RequestModel.java

@@ -1,12 +1,13 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -20,11 +21,13 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel("远程调用方法参数")
-public class RequestModel {
+public class RequestModel implements Serializable {
     @ApiModelProperty("执行方法的key")
     private String methodHandlerKey;
     @ApiModelProperty("方法的入参")
     private Map<String, Object> jsonParamMap;
+    @ApiModelProperty(value = "调用方法参数列表", allowEmptyValue = true)
+    private Object[] jsonParamArray;
     @ApiModelProperty("日志id")
     private Long logId;
     @ApiModelProperty("方法类型-脚本-方法")
@@ -33,6 +36,8 @@ public class RequestModel {
     private Integer scriptType;
     @ApiModelProperty("脚本内容")
     private String scriptContent;
-//    @ApiModelProperty("脚本执行位置")
+    @ApiModelProperty("日志时间")
-//    private Integer scriptExecutor;
+    private String logDateTimeParam;
+    @ApiModelProperty("调用的超时时间")
+    private Integer executorTimeout;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java

@@ -30,9 +30,9 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
 
     private static final long serialVersionUID = -3871002350228229604L;
 
-    @Column(name = "APP_NAME")
+    @Column(name = "APP_TYPE")
-    @ApiModelProperty("执行器组的applicationName")
+    @ApiModelProperty("执行器组的applicationType")
-    private String appName;
+    private Integer appType;
 
     @Column(name = "ADDRESS_STR")
     @ApiModelProperty("注册地址字符串，地址用逗号间隔")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java

@@ -29,18 +29,14 @@ import java.util.Date;
 public class ExecutorRegistryInfo extends BaseBean implements Serializable {
     private static final long serialVersionUID = -736085114778936163L;
 
-    @Column(name = "APP_NAME")
+    @Column(name = "APP_TYPE")
-    @ApiModelProperty("执行器application Name")
+    @ApiModelProperty("执行器类型,代替appName")
-    private String appName;
+    private Integer appType;
 
     @Column(name = "ADDRESS")
     @ApiModelProperty("执行器地址，包含ip:port")
     private String address;
 
-    @Column(name = "UPDATE_TIME")
-    @ApiModelProperty("最近一次心跳时间")
-    private Date updateTime;
-
     @Column(name = "WEIGHT")
     @ApiModelProperty("执行器权重")
     private Integer weight;
@@ -52,4 +48,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable {
     @Column(name = "EXECUTOR_TYPE")
     @ApiModelProperty("执行器的类型，同枚举Method_group_Type")
     private Integer executorType;
+
+    @Column(name = "REGISTRY_TYPE")
+    @ApiModelProperty("执行器注册类型，手动1，自动注册2")
+    private Integer registryType;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodDocInfo.java

@@ -29,16 +29,16 @@ import java.io.Serializable;
 public class ExecutorRegistryMethodDocInfo extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2770821289940006535L;
 
-    @ApiModelProperty(value = "应用名称")
+    @ApiModelProperty(value = "应用类型")
-    @Column(name = "APP_NAME")
+    @Column(name = "APP_TYPE")
-    private String appName;
+    private Integer appType;
 
+    @Lob
     @ApiModelProperty(value = "markdown文本，前端渲染")
     @Column(name = "MARKDOWN")
     private String markdown;
 
     @ApiModelProperty(value = "方法名,方法名和应用名做唯一键")
-    @Lob
     @Column(name = "METHOD_NAME")
     private String methodName;
 

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java

@@ -46,9 +46,9 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable
     @ApiModelProperty("方法的版本号")
     private String version;
 
-    @Column(name = "APP_NAME")
+    @Column(name = "APP_TYPE")
-    @ApiModelProperty("所属执行器的appName")
+    @ApiModelProperty("所属执行器的appType")
-    private String appName;
+    private Integer appType;
 
     @Column(name = "METHOD_TYPE")
     @ApiModelProperty("方法类型，属于那个执行器类型,同枚举类method_group_type")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/vo/AppSummaryVo.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/2/7 14:21
+ * @Modify:
+ **/
+@Data
+@ApiModel(value = "按应用类型统计调用次数")
+public class AppSummaryVo {
+
+    @ApiModelProperty(value = "开始时间")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endDate;
+
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\15 15:58
+ * @Modify:
+ **/
+@Data
+public class SysUserOfflineModel implements Serializable {
+
+
+    @ApiParam("人员ID")
+    private Long userId;
+
+    @ApiParam("用户编号")
+    private String userCode;
+
+    @ApiParam("用户名称")
+    private String userName;
+
+    @ApiParam("登陆名称")
+    private String loginName;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    public SysUserOfflineModel() {}
+
+    public SysUserOfflineModel(Long userId, String userCode, String userName, String loginName, String organizeCode) {
+        this.userId = userId;
+        this.userCode = userCode;
+        this.userName = userName;
+        this.loginName = loginName;
+        this.organizeCode = organizeCode;
+    }
+}

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

@@ -130,6 +130,11 @@ public class SuitClientModel implements Serializable {
      */
     private Boolean duplicate;
 
+    /**
+     * ftp client 端适配文件名称
+     */
+    private String originFileName;
+
     private boolean isNeedRetry = false;
 
     public SuitClientModel() {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java

@@ -43,6 +43,10 @@ public class ScrPanel extends BaseBean implements Serializable {
     @ApiModelProperty("Panel名称")
     private String panelName;
 
+    @Column(name = "PARENT_TEMPLATE_PANEL")
+    @ApiModelProperty("副本的模板的panel")
+    private String parentTemplatePanel;
+
     @Column(name = "IS_TEMPLATE")
     @ApiModelProperty("是否为模板")
     private Integer isTemplate;