diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java index 89f5df3..92865d0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileBackLogVO.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.manage.pojo.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -15,8 +16,10 @@ public class FileBackLogVO { private String fileName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date backStartTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date backEndTime; private boolean backupSuccess; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 9f5e4c0..a1549e6 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -121,6 +121,10 @@ public class CommonService { PATH_MAP.put(DataOwnEnum.REPO_PRJ.code, elePropertyConfig.getRepoPrjPath()); } + public String getPrjPath(int dataOwnCode) { + return PATH_MAP.get(dataOwnCode) + File.separator; + } + public String getEleDataPath(int dataOwnCode) { if (DataOwnEnum.isUserCode(dataOwnCode)) { @@ -147,7 +151,8 @@ public class CommonService { public String getFileSysPath(String dbPath, int dataOwnCode) { ArrayList paths = CollUtil.newArrayList(dbPath.split(MYSQL_FILE_PATH_SPLIT)); String path = getDbPath(paths); - return getEleDataPath(dataOwnCode) + File.separator + path; + String destPath = getEleDataPath(dataOwnCode) + File.separator + path; + return destPath.replace("//", "/"); } public String getDbPath(String dbPath) { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java index 0071c2f..04455dc 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.electromagnetic.industry.software.common.enums.DataOwnEnum; import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum; import com.electromagnetic.industry.software.common.enums.FileBackupSource; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; @@ -21,12 +22,15 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileBackLogVO; import com.electromagnetic.industry.software.manage.pojo.resp.RespPageVO; import com.electromagnetic.industry.software.manage.service.FileBackLogService; import com.electromagnetic.industry.software.manage.tasks.BackupHandler; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.io.File; import java.util.ArrayList; import java.util.List; +@Slf4j @Service public class FileBackLogServiceImpl extends ServiceImpl implements FileBackLogService { @@ -66,7 +70,15 @@ public class FileBackLogServiceImpl extends ServiceImpl