Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -12,6 +12,182 @@ import java.util.Objects;
  * @Modify:
  **/
 public class BlockFormEnumUtil {
+    /**
+     * common普通操作，不执行脚本
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FORM_SCRIPT_TYPE {
+        SAVE(1, "save", "保存"),
+        UPDATE(2, "update", "更新"),
+        DELETE(3, "delete", "删除"),
+        QUERY(4, "query", "查询"),
+        EXPORT(5, "export", "导出"),
+        IMPORT(6, "import", "导入"),
+        COMMON(7,"common","普通操作");
+
+        private int value;
+        private String type;
+        private String description;
+
+        FORM_SCRIPT_TYPE(int value, String type, String description) {
+            this.value = value;
+            this.type = type;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return type;
+        }
+
+        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].type;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].type.toLowerCase().equals(code.toLowerCase())) {
+                    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 static FORM_SCRIPT_TYPE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].type.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 选择执行脚本的位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FORM_SCRIPT_FUN_TYPE {
+        BEFORE_SAVE(1, "beforeSave", "保存前执行"),
+        AFTER_SAVE(2, "afterSave", "保存后执行"),
+        BEFORE_UPDATE(3, "beforeUpdate", "更新前执行"),
+        AFTER_UPDATE(4, "afterUpdate", "更新后执行"),
+        BEFORE_DELETE(5, "beforeDelete", "删除前执行"),
+        AFTER_DELETE(6, "afterDelete", "删除后执行"),
+        BEFORE_QUERY(7, "beforeQuery", "查询前执行"),
+        AFTER_QUERY(8, "afterQuery", "查询后执行"),
+        BEFORE_EXPORT(9, "beforeExport", "导出前执行"),
+        AFTER_EXPORT(10, "afterExport", "导出后执行"),
+        BEFORE_IMPORT(11, "beforeImport", "导入前执行"),
+        AFTER_IMPORT(12, "afterImport", "导入后执行");
+
+
+        private int value;
+        private String funName;
+        private String description;
+
+        FORM_SCRIPT_FUN_TYPE(int value, String funName, String description) {
+            this.value = value;
+            this.funName = funName;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return funName;
+        }
+
+        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].funName;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].funName.toLowerCase().equals(code.toLowerCase())) {
+                    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 static FORM_SCRIPT_FUN_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].funName.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * 原数据类型
@@ -20,7 +196,8 @@ public class BlockFormEnumUtil {
     public enum FORM_TABLE_TYPE {
         TABLE(1, "TABLE", "表"),
         VIEW(2, "VIEW", "视图"),
-        PROCEDURE(3, "PROCEDURE", "存储过程");
+        PROCEDURE(3, "PROCEDURE", "存储过程"),
+        CUSTOM(4, "CUSTOM", "自定义对象");
 
         private int value;
         private String code;
@@ -1915,6 +2092,7 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BUTTON_TRIGGER_EFFECT {
+        SCRIPT(60,"SCRIPT","执行脚本"),
         DIALOG(10, "DIALOG", "弹出窗口"),
         NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"),
         SQL(30, "SQL", "执行SQL"),
@@ -2799,4 +2977,6 @@ public class BlockFormEnumUtil {
         }
     }
 
+
+
 }

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

@@ -576,6 +576,66 @@ public class CommonEnumUtil {
     }
 
     /**
+     * 用户状态
+     * 1.长时间未登录锁定
+     * 2.登录失败次数过多锁定
+     * 3.管理员手动锁定
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCK_TYPE {
+
+        NOT_LOGGED_A_LONG_TIME(1, "not logger a long time", "长时间未登录锁定"),
+        LOGGER_TOO_MANY_FAILURES(2, "logger too many failures", "登录失败次数过多锁定"),
+        ADMIN_HAND_MOVEMENT_LOCKING(3, "admin hand movement locking", "管理员手动锁定");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private LOCK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 数据类型
      * 1库存移动数据
      * 2质检数据

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -74,4 +74,12 @@ public class BfButton extends BaseBean {
     @Column(name = "BUTTON_DESCRIPTION")
     @ApiParam(value = "按钮描述")
     private String buttonDescription;
+
+    @Column(name = "FUN_NAME")
+    @ApiParam(value = "groovy脚本时的方法名")
+    private String funName;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam(value = "脚本No")
+    private String scriptNo;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -75,6 +75,10 @@ public class BfDataObject extends BaseBean {
     @ApiParam(value ="描述")
     private String objectDescription;
 
+    @Column(name="DATA_OBJECT_TYPE")
+    @ApiParam(value ="对象类型")
+    private Integer dataObjectType;
+
     @Transient
     @ApiParam(value = "数据对象属性")
     @AnnoOutputColumn(hidden = true)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -125,6 +125,9 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="属性描述")
     private String propertyDescription;
 
+    @Column(name = "REF_TABLE_NAME")
+    @ApiParam(value ="字段来源的表名--可空,如果自定义对象不可空")
+    private String refTableName;
     @Transient
     @ApiParam(value ="默认查询条件")
     private Integer objectColumnCustomWhere;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -137,6 +137,7 @@ public class BfElement extends BaseBean {
     public boolean isOrganizeIsolation() {
         return isOrganizeIsolation != null && isOrganizeIsolation == BlockFormEnumUtil.ELEMENT_ORGANIZE_ISOLATION_STATUS.ON.getValue();
     }
+
     @Column(name = "ELEMENT_ORGANIZE_ISOLATION_ATTR_ID")
     @ApiParam(value = "组织隔离属性id")
     private Long elementOrganizeIsolationAttrId;
@@ -185,6 +186,26 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "元素描述")
     private String elementDescription;
 
+    /**
+     * 自定义元素
+     * 1: true,只能查询
+     * 2: false,普通元素，支持所有操作
+     */
+    @Column(name = "CUSTOM_ELEMENT")
+    @ApiParam(value = "自定义元素")
+    private Integer customElement;
+
+    /**
+     * BlockFormEnumUtil.FORM_SCRIPT_FUN_TYPE 取值,用逗号隔开
+     */
+    @Column(name = "SCRIPT_EXECUTE_POSITION")
+    @ApiParam(value = "执行脚本的位置,取值为枚举")
+    private String scriptExecutePosition;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam(value = "脚本No")
+    private String scriptNo;
+
     @Transient
     @ApiParam(value = "数据对象")
     private BfDataObject dataObject;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -179,6 +179,9 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value = "账号类型")
     private String userAccountType;
 
+    @ApiParam(value ="密码是否过期(枚举：1是,2否)" , example ="-1")
+    private Integer userPasswordOverdue;
+
 
     public SysUser getSysUser(){
         SysUser user = new SysUser();

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -110,6 +110,26 @@ public class SysUser extends BaseBean {
     @Column(name = "USER_ACCOUNT_TYPE")
     @ApiParam(value = "用户账号类型")
     private String userAccountType;
+
+    @Column(name = "LOCK_TYPE")
+    @ApiParam(value = "锁定状态(枚举：1用户长时间未登录锁定,2登录失败次数过多锁定,3管理员手动锁定)", example = "-1")
+    private Integer lockType;
+
+    @Column(name = "AUTO_UNLOCK_NUM")
+    @ApiParam(value = "自动解锁次数(大于三次账号将锁定)", example = "0")
+    private Integer autoUnlockNum;
+
+    @Column(name = "MODIFY_PWD_NUM")
+    @ApiParam(value = "修改密码的次数", example = "0")
+    private Integer modifyPwdNum;
+
+    @Column(name = "USER_PASSWORD_OVERDUE")
+    @ApiParam(value = "密码是否过期", example = "-1")
+    private Integer userPasswordOverdue;
+
+    @Column(name = "RESET_PASSWORD_TIME")
+    @ApiParam(value = "重置密码的时间")
+    private String resetPasswordTime;
     /********************************** 关系信息 ********************************/
 
     @Column(name = "DEPARTMENT_ID")

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -66,6 +66,10 @@ public class PtlControl extends BaseBean implements Serializable {
     public transient Integer lockVersion;
 
     @Column(name = "BACKOFF")
-    @ApiParam("是否需要回调")
+    @ApiParam("是否需要回调--废弃,使用不同的策略")
     private Integer backoff;
+
+    @Column(name = "BACK_NAME")
+    @ApiParam("回调类--反射获取调用execute方法")
+    private String backName;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WhLightOnModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/10/12 14:54
+ * @Modify:
+ **/
+@Data
+@ApiModel(value = "mes-pcn调用亮灯接口")
+public class WhLightOnModel {
+
+    @ApiModelProperty(value = "工厂")
+    private String organizeCode;
+
+    @ApiModelProperty(value = "总成物料号")
+    private String partNo;
+
+    @ApiModelProperty(value = "亮灯区域")
+    private String areaNo;
+
+    @ApiModelProperty(value = "操作员")
+    private String userName;
+}

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

@@ -403,7 +403,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
 
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"createDatetime"},ddlPackBean);
 
         return ddlPackBean;
     }

pom.xml

@@ -166,7 +166,7 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
-                <version>1.4.0</version>
+                <version>1.10.1</version>
             </dependency>