|
|
@@ -1,6 +1,8 @@
|
|
|
package cn.iocoder.yudao.module.pms.message;
|
|
|
|
|
|
+import cn.hutool.core.date.DatePattern;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.date.LocalDateTimeUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.iocoder.yudao.module.pms.constant.PmsConstants;
|
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
|
|
|
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.time.Instant;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.ZonedDateTime;
|
|
|
import java.util.Date;
|
|
|
@@ -117,7 +120,10 @@ public class PmsMessage {
|
|
|
|
|
|
// 瑞恒日报汇总生产动态提醒
|
|
|
if (PmsConstants.RH_PRODUCTION_STATUS.equals(businessType)) {
|
|
|
- msg = "**瑞恒生产动态** \n" + name + "["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
|
|
|
+ // businessId 时间戳 转换成 yyyy-MM-dd
|
|
|
+ LocalDateTime yesterday = LocalDateTime.ofInstant(Instant.ofEpochMilli(businessId),ZoneId.of("Asia/Shanghai"));
|
|
|
+ String yesterdayPattern = LocalDateTimeUtil.format(yesterday, DatePattern.NORM_DATE_PATTERN);
|
|
|
+ msg = "**"+yesterdayPattern+"瑞恒生产动态** \n" + name + "["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
|
|
|
}
|
|
|
|
|
|
// 瑞鹰项目启动设备整改
|