Bläddra i källkod

事故时间轴接口

tags/v1.2.0^2
chengwang 1 år sedan
förälder
incheckning
2b407eda03
3 ändrade filer med 11 tillägg och 4 borttagningar
  1. +4
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/TimeAxisService.java
  2. +0
    -4
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentPromptlyLookVo.java
  3. +7
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentTimeAxisVo.java

+ 4
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/TimeAxisService.java Visa fil

@@ -83,6 +83,10 @@ public class TimeAxisService {
if(accident.getReportTime() != null){
vo.setReportTime(accident.getReportTime());
}
//无事故时间
if(accident.getNoAccidentTime() != null){
vo.setNoAccidentTime(accident.getNoAccidentTime());
}
//结束时间
if(accident.getEndTime() !=null){
vo.setEndTime(accident.getEndTime());

+ 0
- 4
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentPromptlyLookVo.java Visa fil

@@ -18,10 +18,6 @@ public class AccidentPromptlyLookVo {
*/
private String realName;

// /**
// * 已读人数
// */
// private Integer number;

/**
* 立即查看

+ 7
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentTimeAxisVo.java Visa fil

@@ -40,6 +40,13 @@ public class AccidentTimeAxisVo {
@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 noAccidentTime;

/**
* 事故结束时间
*/

Laddar…
Avbryt
Spara