From 46d220f3ec5d90507c742212bda02a7d2c8ab245 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Tue, 3 Sep 2019 10:56:52 +0800
Subject: [PATCH] =?UTF-8?q?mes=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java    | 57 ++++++++++++++++++++++
 .../repository/MesPcnSysUserOfflineRepository.java | 16 ++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 17 +++++++
 3 files changed, 90 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
new file mode 100644
index 0000000..684fe5e
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+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.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 javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 账号离线登陆表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-01 11:02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYS_USER_OFFLINE")
+@Api(value="账号离线登陆表",description = "账号离线登陆表。")
+public class MesPcnSysUserOffline extends BaseBean {
+
+    @Column(name = "USER_ID")
+    @ApiParam(value = "人员ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名称", access = "账号名称")
+    private String userName;
+
+    @Column(name = "LOGIN_NAME")
+    @ApiParam(value = "登陆名称", access = "登陆名称")
+    private String loginName;
+
+    @Column(name="ORGANIZE_ID")
+    @ApiParam(value ="部门ID" , example ="-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
+
+    @Column(name="ORGANIZE_NAME")
+    @ApiParam(value ="部门名称" , access ="部门名称")
+    private String organizeName;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java
new file mode 100644
index 0000000..111a055
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnSysUserOfflineRepository extends BaseRepository<MesPcnSysUserOffline, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index fa0f89f..3f16e63 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -1170,4 +1170,21 @@ public class MesHqlPack {
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
+
+    /**
+     * 条码生成规则校验同一机构下条码规则唯一性
+     * @param numberRule
+     * @param id
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesNumberRuleCheck(String numberRule, Long id, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(numberRule, "numberRule", packBean);
+        if (null != id) {
+            DdlPreparedPack.getNumNOEqualPack(id, "id", packBean);
+        }
+        return packBean;
+    }
 }