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

修改发现的问题

This commit is contained in:
chenxudong 2025-03-26 15:53:24 +08:00
parent 9da19d7e4e
commit 849f96cf20
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java
View File

@ -43,7 +43,7 @@ public class UserEdFileInfoController {
return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.USER_FILE.code); return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.USER_FILE.code);
} }
@UserOperation(value = "作废文件夹", modelName = UserOperationModuleEnum.USER_PRJ) @UserOperation(value = "作废", modelName = UserOperationModuleEnum.USER_PRJ)
@RequestMapping("delete") @RequestMapping("delete")
public ElectromagneticResult<?> delete(@RequestParam String id) { public ElectromagneticResult<?> delete(@RequestParam String id) {
return edFileInfoService.delete(id, DataOwnEnum.USER_FILE.code); return edFileInfoService.delete(id, DataOwnEnum.USER_FILE.code);

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/AccessLogQueryVO.java
View File

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.manage.pojo.resp; package com.electromagnetic.industry.software.manage.pojo.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -23,6 +24,7 @@ public class AccessLogQueryVO {
private String operationMsg; private String operationMsg;
// 操作时间 // 操作时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
// 请求远端地址 // 请求远端地址

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -1190,6 +1190,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
fileSystemService.save(file.getInputStream(), fileDestPath); fileSystemService.save(file.getInputStream(), fileDestPath);
EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
return newEdFileInfo; return newEdFileInfo;
} else if (strategy == FileRepeatEnum.NEW.code) { } else if (strategy == FileRepeatEnum.NEW.code) {
// 文件名加”_1“，存为新文件 // 文件名加”_1“，存为新文件
@ -1219,6 +1220,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
fileSystemService.save(file.getInputStream(), fileDestPath); fileSystemService.save(file.getInputStream(), fileDestPath);
EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
return newEdFileInfo; return newEdFileInfo;
} }
return null; return null;

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
View File

@ -43,7 +43,7 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
@Override @Override
public ElectromagneticResult<?> info(AccessLogQueryDTO pars, boolean adminQuery) { public ElectromagneticResult<?> info(AccessLogQueryDTO pars, boolean adminQuery) {
LambdaQueryWrapper<UserAccessLog> queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class); LambdaQueryWrapper<UserAccessLog> queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class).orderByDesc(UserAccessLog::getCreateTime);
if (!adminQuery) { if (!adminQuery) {
queryWrapper.eq(UserAccessLog::getDataId, pars.getDataId()); queryWrapper.eq(UserAccessLog::getDataId, pars.getDataId());
} else { } else {

4
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java
View File

@ -7,8 +7,8 @@ import java.util.Objects;
@AllArgsConstructor @AllArgsConstructor
public enum UserOperationModuleEnum { public enum UserOperationModuleEnum {
SYS_PRJ_SETTING("sys_prj_setting", "数据库层级定义"), SYS_PRJ_SETTING("sys_prj_setting", "项目数据层级定义"),
SYS_PRJ_DATABASE("sys_prj_database", "数据库管理"), SYS_PRJ_DATABASE("sys_prj_database", "项目数据管理"),
REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"), REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"),
REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"), REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"),