diff --git a/modules/i3plus-ext-mes-pcn-api/pom.xml b/modules/i3plus-ext-mes-pcn-api/pom.xml index b56cf92..8b21757 100644 --- a/modules/i3plus-ext-mes-pcn-api/pom.xml +++ b/modules/i3plus-ext-mes-pcn-api/pom.xml @@ -18,8 +18,6 @@ i3plus.ext.mes.pcn i3plus-ext-mes-pcn-pojo - 1.0.0.1 - compile diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/sqlpack/MesPcnExtHqlPack.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/sqlpack/MesPcnExtHqlPack.java index ba70baa..2651bfc 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/sqlpack/MesPcnExtHqlPack.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/sqlpack/MesPcnExtHqlPack.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.ext.mes.pcn.pojo.sqlpack; -import cn.estsh.i3plus.ext.mes.pcn.pojo.bean.*; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java deleted file mode 100644 index 55003ac..0000000 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java +++ /dev/null @@ -1,73 +0,0 @@ -package cn.estsh.i3plus.ext.mes.pcn.pojo.util; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import lombok.Data; -import org.springframework.beans.BeanUtils; - -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -/** - * @DESCRIPTION: - * @USER: wangjie - * @DATE: 2022-11-24 16:04 - */ -@Data -public class ConvertBeanExt { - - private String organizeCodeExt; - - private Integer isValidExt; - - private Integer isDeletedExt; - - private String createUserExt; - - private String createDatetimeExt; - - private String modifyUserExt; - - private String modifyDatetimeExt; - - private Integer systemSyncStatusExt; - - public ConvertBeanExt() {} - - public ConvertBeanExt(BaseBean bean) { - this.organizeCodeExt = bean.getOrganizeCode(); - this.isValidExt = bean.getIsValid(); - this.isDeletedExt = bean.getIsDeleted(); - this.createUserExt = bean.getCreateUser(); - this.createDatetimeExt = bean.getCreateDatetime(); - this.modifyUserExt = bean.getModifyUser(); - this.modifyDatetimeExt = bean.getModifyDatetime(); - this.systemSyncStatusExt = MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(); - } - - public ConvertBeanExt notSync() { - this.systemSyncStatusExt = MesPcnExtEnumUtil.IF_SYNC_STATUS.ALREADY_SYNC.getValue(); - return this; - } - - public void convertBean(Object o) { - BeanUtils.copyProperties(this, o); - } - - public BaseBean checkMdtAdd1s(BaseBean bean, String userName) { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(MesPcnExtConstWords.DATETIME_FORMAT); - Date date = new Date(); - String dateTime = simpleDateFormat.format(date); - if (dateTime.compareTo(bean.getModifyDatetime()) <= 0) dateTime = getModifyDatetimeAdd1s(simpleDateFormat, date); - bean.setModifyUser(userName); - bean.setModifyDatetime(dateTime); - return bean; - } - - private String getModifyDatetimeAdd1s(SimpleDateFormat simpleDateFormat, Date date) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.SECOND, 1); - return simpleDateFormat.format(cal.getTime()); - } -} diff --git a/pom.xml b/pom.xml index 1aac697..1d9e110 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 1.0.0.1-patch 1.0.0.1-patch 1.0.0-yfai + 1.0.0-yfai 2.17.1