tags/yfai-pcn-ext-v1.0
王杰 1 year ago
parent da209d5551
commit d7fd02ca2f

@ -18,8 +18,6 @@
<dependency>
<groupId>i3plus.ext.mes.pcn</groupId>
<artifactId>i3plus-ext-mes-pcn-pojo</artifactId>
<version>1.0.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>

@ -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;

@ -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());
}
}

@ -35,6 +35,7 @@
<i3plus.platform.version>1.0.0.1-patch</i3plus.platform.version>
<i3plus.icloud.version>1.0.0.1-patch</i3plus.icloud.version>
<i3plus.mes.pcn.version>1.0.0-yfai</i3plus.mes.pcn.version>
<i3plus.mes.pcn.ext.version>1.0.0-yfai</i3plus.mes.pcn.ext.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>

Loading…
Cancel
Save