在线编辑-更新基线信息接口。
This commit is contained in:
+23
-21
@@ -518,34 +518,36 @@ public class OnlyOfficeController {
|
|||||||
public OnlineFileLog getCreateTimeLatestOnlineFileLog(String fileId,Date now){
|
public OnlineFileLog getCreateTimeLatestOnlineFileLog(String fileId,Date now){
|
||||||
QueryWrapper<OnlineFileLog> ofLogQueryWrap = new QueryWrapper<>();
|
QueryWrapper<OnlineFileLog> ofLogQueryWrap = new QueryWrapper<>();
|
||||||
ofLogQueryWrap.lambda().eq(OnlineFileLog::getHisId,fileId);
|
ofLogQueryWrap.lambda().eq(OnlineFileLog::getHisId,fileId);
|
||||||
ofLogQueryWrap.lambda().orderByDesc(OnlineFileLog::getCreateTime);
|
ofLogQueryWrap.lambda().ge(OnlineFileLog::getCreateTime,now);
|
||||||
|
ofLogQueryWrap.lambda().orderByAsc(OnlineFileLog::getCreateTime);
|
||||||
List<OnlineFileLog> onlineFileLogs = this.onlineFileLogDao.selectList(ofLogQueryWrap);
|
List<OnlineFileLog> onlineFileLogs = this.onlineFileLogDao.selectList(ofLogQueryWrap);
|
||||||
|
|
||||||
OnlineFileLog result = null;
|
OnlineFileLog result = null;
|
||||||
if (CollectionUtils.isNotEmpty(onlineFileLogs)) {
|
if (CollectionUtils.isNotEmpty(onlineFileLogs)) {
|
||||||
result = onlineFileLogs.get(0);
|
result = onlineFileLogs.get(0);
|
||||||
}
|
}
|
||||||
if (ObjectUtils.isNotEmpty(result)) {
|
|
||||||
long nowTime = now.getTime();
|
|
||||||
long createTime = result.getCreateTime().getTime();
|
|
||||||
|
|
||||||
// 如果数据的创建时间大于当前时间,直接返回
|
// if (ObjectUtils.isNotEmpty(result)) {
|
||||||
if (createTime > nowTime) {
|
// long nowTime = now.getTime();
|
||||||
return result;
|
// long createTime = result.getCreateTime().getTime();
|
||||||
}
|
//
|
||||||
|
// // 如果数据的创建时间大于当前时间,直接返回
|
||||||
// 计算时间差
|
// if (createTime > nowTime) {
|
||||||
long diff = Math.abs(nowTime - createTime);
|
// return result;
|
||||||
|
// }
|
||||||
// 判断时间差是否小于等于10秒
|
//
|
||||||
if (diff <= 10 * 1000) {
|
// // 计算时间差
|
||||||
System.out.println("两个日期在十秒内");
|
// long diff = Math.abs(nowTime - createTime);
|
||||||
} else {
|
//
|
||||||
System.out.println("两个日期不在十秒内");
|
// // 判断时间差是否小于等于10秒
|
||||||
|
// if (diff <= 10 * 1000) {
|
||||||
result = null;
|
// System.out.println("两个日期在十秒内");
|
||||||
}
|
// } else {
|
||||||
}
|
// System.out.println("两个日期不在十秒内");
|
||||||
|
//
|
||||||
|
// result = null;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
if (ObjectUtils.isEmpty(result)){
|
if (ObjectUtils.isEmpty(result)){
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user