From 46d220f3ec5d90507c742212bda02a7d2c8ab245 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 3 Sep 2019 10:56:52 +0800 Subject: [PATCH 1/6] =?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 { +} 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; + } } From 32502582c185b1cd1eeb04f86b2405ccd86f6ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 10:56:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 6 ++++++ 1 file changed, 6 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 0eb845c..68b5190 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 @@ -1196,6 +1196,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep fieldSetInitParam(item, checkField); } } + for(Field checkField : clazz.getDeclaredFields()){ + if(checkField.get(item) == null){ + // 未赋值的属性，进行初始化赋值 + fieldSetInitParam(item, checkField); + } + } } entityManager.merge(item); From d5cfe77ac553b134eb0e3b92dd9d9f5f42ef1714 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 3 Sep 2019 11:13:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?mes=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cc709a5..5148235 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes-pcn定时任务状态 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_TASK_STATUS { + + OPEN(1, "OPEN"), + CLOSE(2, "CLOSE"); + + private int value; + private String description; + + MES_PCN_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + /** * mes工步类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From b4b095c970dd663873fd568b1415dfad8e62bcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 11:35:23 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89final=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++++ 1 file changed, 4 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 68b5190..8e5a7a0 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 @@ -14,6 +14,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import javax.persistence.*; import java.io.Serializable; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.text.SimpleDateFormat; import java.util.*; @@ -1223,6 +1224,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private void fieldSetInitParam(T item,Field field) { try { + if (Modifier.isFinal(field.getModifiers())) { + return; + } if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { From 3a1cf7a2b75386054cac4c2298809ec85672ce83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 11:38:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89final=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 8e5a7a0..4d1d04f 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 @@ -1191,14 +1191,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep //属性值过滤，避免null值 if(initParam){ - for(Field checkField : clazz.getFields()){ - if(checkField.get(item) == null){ + for (Field checkField : clazz.getFields()) { + if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } } - for(Field checkField : clazz.getDeclaredFields()){ - if(checkField.get(item) == null){ + for (Field checkField : clazz.getDeclaredFields()) { + if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } @@ -1224,9 +1224,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private void fieldSetInitParam(T item,Field field) { try { - if (Modifier.isFinal(field.getModifiers())) { - return; - } if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { From 69d2932ca496548d6c88e826e8da28914e70634a Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 3 Sep 2019 11:44:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?http=E8=AF=B7=E6=B1=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 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 a549eee..3756ccf 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 @@ -910,9 +910,10 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONTENT_TYPE { FORM("x-www-form-urlencoded", "表单"), - FILE(" multipart/form-data", "文件"), - JSON(" application/json", "JSON"), - XML(" application/xml ", "XML"); + FILE("multipart/form-data", "文件"), + JSON("application/json", "JSON"), + NONE("default", "默认不需要设置Content-Type"), + XML("application/xml", "XML"); private String value; private String description;