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

Merge branch 'dev-jdk17' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into dev-jdk17

This commit is contained in:
s2042968 2025-04-24 09:14:54 +08:00
parent 851c7e0d47 d8fec2ca0b
commit fe656f9beb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
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;
@ -28,6 +29,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(maxEndTime); return ElectromagneticResultUtil.success(DateUtil.date(maxEndTime));
} }
} }