修改预警弹窗下发通知接口

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/AccidentNoticeService.java

@@ -44,10 +44,8 @@ public class AccidentNoticeService {
      */
     public JsonResult notice() {
         //当前登录用户
-//        String tenantId = CurrentUserUtil.getTenantId();
-//        String userId = CurrentUserUtil.getUserId();
-        String userId = "e1df76387f28b93a523c97a3e0cf27f9";
-        String tenantId = "0";
+        String tenantId = CurrentUserUtil.getTenantId();
+        String userId = CurrentUserUtil.getUserId();
         if(StringUtils.isEmpty(userId)){
             throw new ServiceException("当前用户id为空");
         }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/TimeAxisService.java

@@ -81,7 +81,9 @@ public class TimeAxisService {
             vo.setReportTime(accident.getReportTime());
         }
         //忽略时间
-
+        if(accident.getIgnoreTime() != null){
+            vo.setIgnoreTime(accident.getIgnoreTime());
+        }
         //无事故时间
         if(accident.getNoAccidentTime() != null){
             vo.setNoAccidentTime(accident.getNoAccidentTime());