chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenxudong:d8fec2ca0be7763dfb3844e5dd0153d427fdec24
Branches Tags
chenxudong:master
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
..
compare: chenxudong:77cf01c3722a5474cf821e015bb249aba8515003
Branches Tags
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
chenxudong:master

No commits in common. "d8fec2ca0be7763dfb3844e5dd0153d427fdec24" and "77cf01c3722a5474cf821e015bb249aba8515003" have entirely different histories.
d8fec2ca0b ... 77cf01c372

1 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

3
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileBackupLogController.java
View File

@ -1,6 +1,5 @@
package com.electromagnetic.industry.software.manage.controller; package com.electromagnetic.industry.software.manage.controller;
import cn.hutool.core.date.DateUtil;
import com.electromagnetic.industry.software.common.annotations.UserOperation; import com.electromagnetic.industry.software.common.annotations.UserOperation;
import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum; import com.electromagnetic.industry.software.common.enums.UserOperationModuleEnum;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
@ -29,6 +28,6 @@ public class FileBackupLogController {
@UserOperation(value = "系统恢复", modelName = UserOperationModuleEnum.BACKUP_FILE) @UserOperation(value = "系统恢复", modelName = UserOperationModuleEnum.BACKUP_FILE)
public ElectromagneticResult<?> restore() { public ElectromagneticResult<?> restore() {
Long maxEndTime = fileBackLogService.restore(); Long maxEndTime = fileBackLogService.restore();
return ElectromagneticResultUtil.success(DateUtil.date(maxEndTime)); return ElectromagneticResultUtil.success(maxEndTime);
} }
} }