Browse Source

事故时间轴接口

tags/v1.2.0^2
chengwang 1 year ago
parent
commit
30d62857a7
4 changed files with 47 additions and 16 deletions
  1. +21
    -0
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Accident.java
  2. +14
    -9
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/TimeAxisService.java
  3. +5
    -5
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentPromptlyLookVo.java
  4. +7
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentTimeAxisVo.java

+ 21
- 0
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/entity/Accident.java View File

*/ */
private Integer flag; 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;

} }

+ 14
- 9
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/TimeAxisService.java View File

if(StringUtils.isNotEmpty(user.getRealname())){ if(StringUtils.isNotEmpty(user.getRealname())){
promptlyLookVo.setRealName(user.getRealname()); promptlyLookVo.setRealName(user.getRealname());
} }
//已读人数
promptlyLookVo.setNumber(accidentReadList.size());
list.add(promptlyLookVo); list.add(promptlyLookVo);
} }
vo.setLookTimeList(list); 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);
} }
} }

+ 5
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentPromptlyLookVo.java View File

*/ */
private String realName; private String realName;


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


/** /**
* 立即查看 * 立即查看
*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date LookNowTime;
private Date lookNowTime;
} }

+ 7
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/accident/AccidentTimeAxisVo.java View File

*/ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @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") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date ReportingTime;
private Date reportTime;


/** /**
* 事故结束时间 * 事故结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime; private Date endTime;


/**
* 立即查看可读人数
*/
private Integer number;



} }

Loading…
Cancel
Save