事故时间轴接口

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Accident.java

@@ -144,4 +144,25 @@ public class Accident extends BaseEntity {
      */
     private Integer flag;
 
+    /**
+     * 核实时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @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 reportTime;
+
+    /**
+     * 结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
+
 }

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

@@ -72,18 +72,23 @@ public class TimeAxisService {
             if(StringUtils.isNotEmpty(user.getRealname())){
                 promptlyLookVo.setRealName(user.getRealname());
             }
-            //已读人数
-            promptlyLookVo.setNumber(accidentReadList.size());
             list.add(promptlyLookVo);
         }
         vo.setLookTimeList(list);
         //核实时间
-
-
-
-
-
-
-        return null;
+        if(accident.getVerificationTime() != null){
+            vo.setVerificationTime(accident.getVerificationTime());
+        }
+        //上报时间
+        if(accident.getReportTime() != null){
+            vo.setReportTime(accident.getReportTime());
+        }
+        //结束时间
+        if(accident.getEndTime() !=null){
+            vo.setEndTime(accident.getEndTime());
+        }
+        //立即查看已读人数
+        vo.setNumber(accidentReadList.size());
+        return JsonResult.success(vo);
     }
 }

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

@@ -18,15 +18,15 @@ public class AccidentPromptlyLookVo {
      */
     private String realName;
 
-    /**
-     * 已读人数
-     */
-    private Integer number;;
+//    /**
+//     * 已读人数
+//     */
+//    private Integer number;
 
     /**
      * 立即查看
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date LookNowTime;
+    private Date lookNowTime;
 }

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

@@ -31,14 +31,14 @@ public class AccidentTimeAxisVo {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date VerificationTime;
+    private Date verificationTime;
 
     /**
      * 上报时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date ReportingTime;
+    private Date reportTime;
 
     /**
      * 事故结束时间
@@ -47,5 +47,10 @@ public class AccidentTimeAxisVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
+    /**
+     * 立即查看可读人数
+     */
+    private Integer number;
+
 
 }