Merge remote-tracking branch 'origin/master'

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")+")每日数据上报");
             }
         }

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<MessagePushLogMapp
                 String createTime = "";
                 if ("数据消息".equals(type)) {
                     String thing2 = map.get("thing2");
-                    title = thing2;
+                    if(StringUtils.isNotBlank(thing2)){
+                        title = thing2;
+                    }else{
+                        title = "无";
+                    }
+
                     createTime = map.get("time1");
                 } else if ("风险提示".equals(type)) {
                     String thing3 = map.get("thing3");
                     String thing4 = map.get("thing4");
+                    if(StringUtils.isNotBlank(thing3) && StringUtils.isNotBlank(thing4)){
+                        title = thing3 + "-" + thing4;
+                    }else if(StringUtils.isNotBlank(thing3)){
+                        title = thing3;
+                    }else if(StringUtils.isNotBlank(thing4)){
+                        title = thing4;
+                    }else{
+                        title = "无";
+                    }
                     title = thing3 + "-" + thing4;
                     createTime = map.get("time5");
                 } else if ("设备状态".equals(type)) {
                     String thing3 = map.get("thing3");
-                    title = thing3;
+                    if(StringUtils.isNotBlank(thing3)){
+                        title = thing3;
+                    }else{
+                        title = "无";
+                    }
+
                     createTime = map.get("time4");
                 }
                 messagePushPcLogVo.setTitle(title);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml

@@ -69,7 +69,7 @@
     </select>
     <select id="messageNotice" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVos">
         SELECT
-        log.messageTime,
+        date_format(log.messageTime, '%Y-%m-%d') as messageTime,
         log.content,
         CASE
         log.state
@@ -84,7 +84,7 @@
         <where> ${ew.sqlSegment} </where>
         UNION
         SELECT
-        log.messageTime,
+        date_format(log.messageTime, '%Y-%m-%d') as messageTime,
         log.content,
         CASE
         log.state
@@ -96,7 +96,7 @@
         <where> ${ew.sqlSegment} </where>
         UNION
         SELECT
-        log.messageTime,
+        date_format(log.messageTime, '%Y-%m-%d') as messageTime,
         log.content,
         CASE
         log.state

yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java

@@ -344,7 +344,6 @@ public class SealRecordService extends MybatisBaseService<SealRecordMapper, Seal
 			return resultBean;
 		}
 		String user_sid = dto.getUser_sid();
-//		String user_sid = "4ee0138e-7b10-4ca1-a9a3-71ff94066a73";
 		String project_sid = dto.getProject_sid();
 		dto.setUser_sid(user_sid);
 		if(StringUtils.isBlank(user_sid)){