diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java index ad33566d..d44c3984 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVos.java @@ -1,10 +1,12 @@ package com.yxt.supervise.report.api.riskmessageslog; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.yxt.common.core.vo.Vo; import com.yxt.supervise.report.api.imgmessageslog.Linkers; import lombok.Data; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,28 +42,29 @@ public class RiskMessagesLogVos implements Vo { //{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00} public TemplateMessageVo getTemplateMessageVo() { TemplateMessageVo vo=new TemplateMessageVo(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //{time4=2023-09-14 17:17:35, thing8=中通樊家屯仓, thing2=东北角的摄像头,111,22,33} //{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00} if(StrUtil.isNotEmpty(type)){ if(type.equals("设备离线")){ - vo.setTime(map.get("time4")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time4")))); vo.setShName(map.get("thing8")+"设备离线"); }else if(type.equals("设备离线解除")){ - vo.setTime(map.get("time5")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time5")))); vo.setShName(map.get("thing3")+"设备离线解除"); }else if(type.equals("系统异常")){ - vo.setTime(map.get("time4")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time4")))); vo.setShName("环境监控未向平台推送数据"); }else if(type.equals("系统异常解除")){ - vo.setTime(map.get("time5")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time5")))); vo.setShName("环境监控已正常推送数据"); }else if(type.equals("图片对比异常")){ //{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08} - vo.setTime(map.get("time5")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time5")))); vo.setShName(map.get("thing3")+"图片对比异常"); }else if(type.equals("每日数据上报")){ //{time1=2023-08-15 09:57, thing3=赵丽晓, thing2=监管数据总览(喜相随生产加工动产质押项…} - vo.setTime(map.get("time1")); + vo.setTime(sdf.format(DateUtil.parse(map.get("time1")))); vo.setShName(map.get("thing2")+")每日数据上报"); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java index 96157e5e..fa97b576 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java @@ -229,16 +229,35 @@ public class MessagePushLogService extends MybatisBaseService