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

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

@@ -44,8 +44,10 @@ public class AccidentNoticeService {
      */
     public JsonResult notice() {
         //当前登录用户
-        String tenantId = CurrentUserUtil.getTenantId();
-        String userId = CurrentUserUtil.getUserId();
+//        String tenantId = CurrentUserUtil.getTenantId();
+//        String userId = CurrentUserUtil.getUserId();
+        String userId = "e1df76387f28b93a523c97a3e0cf27f9";
+        String tenantId = "0";
         if(StringUtils.isEmpty(userId)){
             throw new ServiceException("当前用户id为空");
         }
@@ -83,7 +85,11 @@ public class AccidentNoticeService {
         }
         List<String> accidentIdList = oldList.stream().map(o -> o.getId()).collect(Collectors.toList());
         newList = accidentMapper.selectList(Wrappers.<Accident>lambdaQuery()
-                .notIn(Accident::getId, accidentIdList));
+                .notIn(Accident::getId, accidentIdList)
+                .eq(Accident::getTenantId, tenantId)
+                .eq(Accident::getStatus, AccidentStatusEnum.UNTREATED.getCode())
+                .eq(Accident::getFlag, FlagEnum.INSPECTION_ACCIDENT.getCode())
+                .eq(Accident::getMark, MarkEnum.VALID.getCode()));
 
         //对应list集合排序
         newList = newList.stream().sorted(Comparator.comparing(Accident::getCreateTime)).collect(Collectors.toList());

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

@@ -80,6 +80,8 @@ public class TimeAxisService {
         if(accident.getReportTime() != null){
             vo.setReportTime(accident.getReportTime());
         }
+        //忽略时间
+
         //无事故时间
         if(accident.getNoAccidentTime() != null){
             vo.setNoAccidentTime(accident.getNoAccidentTime());

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentTimeAxisVo.java

@@ -33,6 +33,13 @@ public class AccidentTimeAxisVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date verificationTime;
 
+    /**
+     * 忽略时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ignoreTime;
+
     /**
      * 上报时间
      */