From 55b047448bd8032746f3b8b16c1588b6afe02168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 6 Aug 2020 18:53:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BC=9A=E8=AF=9D=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=97=B6=E5=87=BA=E7=8E=B0=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 3d4b375..1dba3c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/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 { From a3e8caf085899920ad036cd9daf6b17853b35799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 7 Aug 2020 13:45:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:detachObject=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index afd81eb..3b2f5a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -61,6 +61,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep } public void detachObject(T t){ + if (t == null) { + return; + } entityManager.detach(t); } From 523d2ffc806fc80c8a1d36746cdd7e06df4aa612 Mon Sep 17 00:00:00 2001 From: ypf <2609529090@qq.com> Date: Mon, 10 Aug 2020 13:29:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=AC=A7=E6=B4=B2?= =?UTF-8?q?=E9=A2=86=E6=96=99=E7=9C=8B=E6=9D=BF=E9=80=BB=E8=BE=91=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=9A=84=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 80a7f60..329d006 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/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; From 772229b983a7cabc44dc1988daa240876c20b8ec Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 10 Aug 2020 22:54:28 +0800 Subject: [PATCH 4/5] andon --- .../i3plus/pojo/andon/model/AndonUserModel.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/NotifyUserModel.java | 16 ---------- 2 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonUserModel.java new file mode 100644 index 0000000..846bc5d --- /dev/null +++ b/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; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java index 9a5b3a8..dc8fe48 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/NotifyUserModel.java +++ b/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; From 8d17cfcec00c1f80142ed40c67a01cd1eaeab3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 11 Aug 2020 11:43:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 45 ++++++++++++++ .../pojo/platform/bean/SysUserCustomizeConfig.java | 69 ++++++++++++++++++++++ .../SysUserCustomizeConfigRepository.java | 14 +++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 20 +++++++ 4 files changed, 148 insertions(+) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f6eb1ae..76f1b9b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserCustomizeConfig.java new file mode 100644 index 0000000..68a5917 --- /dev/null +++ b/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; + } + } + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserCustomizeConfigRepository.java new file mode 100644 index 0000000..5093383 --- /dev/null +++ b/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 { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index e00e6e9..0da42ea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/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; + } } \ No newline at end of file