From b64872fc53da9caff1b33088b580ad6187c904f8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 10:08:00 +0800 Subject: [PATCH 1/4] ptl --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java | 58 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 6 +++ 2 files changed, 64 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java new file mode 100644 index 0000000..3f1c2d1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlConfig.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :配置表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_CONFIG") +@Api("PTL配置表") +public class PtlConfig extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8720461903130735342L; + + @Column(name = "CFG_CODE") + @ApiParam("配置代码") + private String cfgCode; + + @Column(name = "CFG_NAME") + @ApiParam("配置名称") + private String cfgName; + + @Column(name = "CFG_TYPE") + @ApiParam("配置类型") + private String cfgType; + + @Column(name = "CFG_KEY") + @ApiParam("配置key") + private String cfgKey; + + @Column(name = "CFG_VALUE") + @ApiParam("配置value") + private String cfgValue; + + @Column(name = "CFG_VAULE_DESC") + @ApiParam("配置value描述") + private String cfgValueDesc; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 7dfbfcc..1f81fd1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -73,4 +74,9 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + } From 51ca581f29417a328463990f05018dc96abc0dfa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 10:23:59 +0800 Subject: [PATCH 2/4] ptl --- .../i3plus/pojo/ptl/repository/PtlConfigRepository.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java new file mode 100644 index 0000000..a52a8fe --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlConfigRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlConfig; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlConfigRepository extends BaseRepository { + +} From 3a88bd7a784fe74c1da8c1a81fffdddff9e46715 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 11:14:57 +0800 Subject: [PATCH 3/4] ptl --- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 39 ++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 6455056..ce00e6d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -6,11 +6,12 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.ptl.bean.PtlConfig; import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure; import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; import java.util.*; import java.util.stream.Collectors; @@ -34,13 +35,13 @@ public class PtlHqlPack { public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + if (!StringUtils.isEmpty(bean.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); - if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) && !StringUtils.isEmpty(bean.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); } // 封装有效状态、删除状态、创建人和创建时间 @@ -51,6 +52,20 @@ public class PtlHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * 打印机管理信息分页查询条件 * * @param ptlPrinterConfigure @@ -85,4 +100,22 @@ public class PtlHqlPack { return result; } + /** + * 配置信息 + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlConfig(PtlConfig ptlConfig) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlConfig, ptlConfig.getOrganizeCode()); + if (!StringUtils.isEmpty(ptlConfig.getCfgCode())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgType())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + } + if (!StringUtils.isEmpty(ptlConfig.getCfgKey())) { + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + } + return packBean; + } } From 34e76f59ce6e156e15b1a315cc5a7e5ab9cd9b00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 13:44:59 +0800 Subject: [PATCH 4/4] ptl --- .../pojo/ptl/model/PtlMonitorControlModel.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java new file mode 100644 index 0000000..40a5e14 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlControl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 亮灯监听Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-02 13:27 + * @Modify: + **/ +@Data +@Api("亮灯监听Model") +public class PtlMonitorControlModel implements Serializable { + + @ApiParam("区域代码") + public String areaNo; + + @ApiParam("区域名称") + public String areaName; + + @ApiParam("控制器集合") + public List ptlControlList; +}