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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Description : 人员model
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class AndonUserModel extends BaseBean {
+
+    @ApiParam(value ="部门名称")
+    private String departmentNameRdd;
+
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="员工编号")
+    private String userEmpNo;
+
+}

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

@@ -2559,10 +2559,8 @@ public class CommonEnumUtil {
         MASTER,NODE
     }
 
-
-
     /**
-     * 业务表：库存条码状态
+     * 会话模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SESSION_MODE {

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

@@ -1331,4 +1331,49 @@ public class ImppEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 用户定制化配置类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_CUSTOMIZE_CONFIG_TYPE {
+        WEB_TABLE_SHOW_COL(10, "前端表格显示列");
+
+        private int value;
+        private String description;
+
+        USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+
+
+        public static Integer descriptionOfValue(String desc) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -61,6 +61,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     public void detachObject(T t){
+        if (t == null) {
+            return;
+        }
         entityManager.detach(t);
     }
 

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

@@ -1,22 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-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.util.List;
 
 /**
  * @Description : 设备任务通知人员model
@@ -34,23 +23,18 @@ public class NotifyUserModel extends BaseBean {
     @ApiParam(value ="账户ID")
     private Long userInfoId;
 
-    @Column(name="USER_NAME_RDD")
     @ApiParam(value ="用户名称" , access ="账号名称")
     private String userName;
 
-    @Column(name="USER_LOGIN_NAME")
     @ApiParam(value ="登陆名称" , access ="登陆名称")
     private String userLoginName;
 
-    @Column(name="USER_EMAIL")
     @ApiParam(value ="邮箱" , access ="邮箱")
     private String userEmail;
 
-    @Column(name="USER_PHONE")
     @ApiParam(value ="手机号" , access ="手机号")
     private String userPhone;
 
-    @Column(name="USER_STATUS")
     @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
     private Integer userStatus;
 

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

@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_USER_CUSTOMIZE_CONFIG")
+@ApiModel(value="用户定制化配置",description = "用户定制化配置")
+public class SysUserCustomizeConfig extends BaseBean {
+
+    private static final long serialVersionUID = -3757585990009089233L;
+
+    @Column(name="USER_ID")
+    @ApiModelProperty(value ="用户id" , example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name="CUSTOMIZE_CONFIG_TYPE")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    @AnnoOutputColumn(refClass = ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.class)
+    private Integer customizeConfigType;
+
+    public String getCustomizeConfigTypeTxt() {
+        return customizeConfigType == null ? "无" : ImppEnumUtil.USER_CUSTOMIZE_CONFIG_TYPE.valueOf(customizeConfigType);
+    }
+
+    @Column(name="CONFIG_KEY")
+    @ApiModelProperty(value ="定制化配置类型" , example = "-1")
+    private String configKey;
+
+    @Column(name="CONFIG_VALUE")
+    @ApiModelProperty(value ="配置值" , example = "-1")
+    private String configValue;
+
+    public String getRedisKey(String keyPrefix) {
+        String redisKey = this.getUserId() + ":" + this.getCustomizeConfigType() + ":" + this.getConfigKey();
+        if (StringUtils.isNotBlank(keyPrefix)) {
+            return keyPrefix + ":" + redisKey;
+        } else {
+            return redisKey;
+        }
+    }
+
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysUserCustomizeConfig;
+
+/**
+ * @Description : 用户定制化配置
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-08-10 15:34
+ * @Modify:
+ **/
+public interface SysUserCustomizeConfigRepository extends BaseRepository<SysUserCustomizeConfig, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1149,4 +1149,24 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+    public static DdlPackBean packHqlSysUserCustomizeConfigOnly(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumNOEqualPack(sysUserCustomizeConfig.getId(),"id",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlGetSysUserCustomizeConfig(SysUserCustomizeConfig sysUserCustomizeConfig){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysUserCustomizeConfig);
+
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getUserId(),"userId",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysUserCustomizeConfig.getConfigKey(),"configKey",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysUserCustomizeConfig.getCustomizeConfigType(),"customizeConfigType",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -103,6 +103,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "计划时间")
     private String planTime;
 
+    @Transient
+    @ApiParam(value = "超时时间(单位:分钟)")
+    private Integer timeOut;
+
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")
     private String srcNo;