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

调通了部分接口

This commit is contained in:
chenxudong 2024-12-30 09:47:22 +08:00
parent 387af49985
commit a9def54df6
7 changed files with 26 additions and 25 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/pojo/models/BaseModel.java
View File

@ -25,7 +25,7 @@ public class BaseModel {
* 最后更新时间 * 最后更新时间
*/ */
@TableField(value = "updated_time") @TableField(value = "updated_time")
private Date updateTime; private Date updatedTime;
/** /**
* 最后更新人 * 最后更新人

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java
View File

@ -123,7 +123,7 @@ public class EdFileInfo extends BaseModel {
Date now = new Date(); Date now = new Date();
this.setUpdatedBy(userId); this.setUpdatedBy(userId);
this.setId(newFileDbId); this.setId(newFileDbId);
this.setUpdateTime(now); this.setUpdatedTime(now);
this.setCreatedTime(now); this.setCreatedTime(now);
this.setFileTime(fileTime); this.setFileTime(fileTime);
this.setCreatedBy(userId); this.setCreatedBy(userId);

7
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java
View File

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.manage.pojo.other; package com.electromagnetic.industry.software.manage.pojo.other;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -29,9 +30,11 @@ public class FileInfoDTO {
private String fileSize; private String fileSize;
private Date updateTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
private String fileCode; private String fileCode;

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/FileInfoQueryDTO.java
View File

@ -28,7 +28,7 @@ public class FileInfoQueryDTO {
/** /**
* 文件类型 （0-文件夹 1-文件） * 文件类型 （0-文件夹 1-文件）
*/ */
private Integer fileType; private Integer dataType;
/** /**
* 上传时间（0-升序，1-降序） * 上传时间（0-升序，1-降序）

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -193,7 +193,7 @@ public class CommonService {
.setFilePath(path) .setFilePath(path)
.setSort(names.size() + 1) .setSort(names.size() + 1)
.setCreatedTime(now) .setCreatedTime(now)
.setUpdateTime(now) .setUpdatedTime(now)
.setCreatedBy(currentUserId) .setCreatedBy(currentUserId)
.setUpdatedBy(currentUserId); .setUpdatedBy(currentUserId);
edFileInfoMapper.insert(fileInfo); edFileInfoMapper.insert(fileInfo);
@ -280,7 +280,7 @@ public class CommonService {
edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
.set(EdFileInfo::getSort, i + 1) .set(EdFileInfo::getSort, i + 1)
.set(EdFileInfo::getUpdatedBy, currentUserId) .set(EdFileInfo::getUpdatedBy, currentUserId)
.set(EdFileInfo::getUpdateTime, now) .set(EdFileInfo::getUpdatedTime, now)
.eq(EdFileInfo::getId, tmp)); .eq(EdFileInfo::getId, tmp));
} }
} }

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

@ -17,10 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; import com.electromagnetic.industry.software.common.enums.*;
import com.electromagnetic.industry.software.common.enums.EleDataSaveStatusEnum;
import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum;
import com.electromagnetic.industry.software.common.enums.PublishEnum;
import com.electromagnetic.industry.software.common.exception.BizException; import com.electromagnetic.industry.software.common.exception.BizException;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.*; import com.electromagnetic.industry.software.common.util.*;
@ -95,15 +92,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) LambdaQueryWrapper<EdFileInfo> queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class)
.select() .select()
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId()) .eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId())
.like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword()) .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword())
.like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileNote, fileInfoQueryDTO.getKeyword()) .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileNote, fileInfoQueryDTO.getKeyword())
.eq(Objects.equals(fileInfoQueryDTO.getFileType(), 0), EdFileInfo::getFileType, 0) .eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FOLDER.code), EdFileInfo::getFileType, EleDataTypeEnum.FOLDER.code)
.eq(Objects.equals(fileInfoQueryDTO.getFileType(), 1), EdFileInfo::getFileType, 1) .eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FILE.code), EdFileInfo::getFileType, EleDataTypeEnum.FILE.code)
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 0), EdFileInfo::getDataStatus, 0) .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.NOT_PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 1), EdFileInfo::getDataStatus, 1) .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code)
.eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 2), EdFileInfo::getDataStatus, 2) .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.OCCUPY.code), EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code)
.orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime) .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
.orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime) .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime)
@ -424,7 +422,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
List<EdFileInfo> deepCopyDb = JSONUtil.toList(JSONUtil.toJsonStr(dbFileInfos), EdFileInfo.class); List<EdFileInfo> deepCopyDb = JSONUtil.toList(JSONUtil.toJsonStr(dbFileInfos), EdFileInfo.class);
EdFileInfo importEffectFile = deepCopyV.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get(); EdFileInfo importEffectFile = deepCopyV.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get();
EdFileInfo dbEffectFile = deepCopyDb.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get(); EdFileInfo dbEffectFile = deepCopyDb.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get();
String effectId = importEffectFile.getUpdateTime().after(dbEffectFile.getUpdateTime()) ? importEffectFile.getId() : dbEffectFile.getId(); String effectId = importEffectFile.getUpdatedTime().after(dbEffectFile.getUpdatedTime()) ? importEffectFile.getId() : dbEffectFile.getId();
Map<String, String> importVersionRelation = getVersionRelation(deepCopyV); Map<String, String> importVersionRelation = getVersionRelation(deepCopyV);
Map<String, String> dbVersionRelation = getVersionRelation(deepCopyDb); Map<String, String> dbVersionRelation = getVersionRelation(deepCopyDb);
dbVersionRelation.putAll(importVersionRelation); dbVersionRelation.putAll(importVersionRelation);
@ -433,7 +431,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
for (EdFileInfo importFileInfo : v) { for (EdFileInfo importFileInfo : v) {
if (dbIdMap.containsKey(importFileInfo.getId())) { // 该文件在数据库中存在，是从线上导出的。 if (dbIdMap.containsKey(importFileInfo.getId())) { // 该文件在数据库中存在，是从线上导出的。
EdFileInfo dbFileInfo = dbIdMap.get(importFileInfo.getId()); EdFileInfo dbFileInfo = dbIdMap.get(importFileInfo.getId());
if (dbFileInfo.getUpdateTime().before(importFileInfo.getUpdateTime())) { // 线下版本的修改时间比线上的新，用线下的版本 if (dbFileInfo.getUpdatedTime().before(importFileInfo.getUpdatedTime())) { // 线下版本的修改时间比线上的新，用线下的版本
importFileInfo.setFileVersion(start); importFileInfo.setFileVersion(start);
saveObjs.add(importFileInfo); saveObjs.add(importFileInfo);
} else { // 线上版本的修改时间比线下新，用线上的版本。 } else { // 线上版本的修改时间比线下新，用线上的版本。
@ -652,7 +650,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
@Override @Override
public ElectromagneticResult<?> versionView(String fileId) { public ElectromagneticResult<?> versionView(String fileId) {
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.select(EdFileInfo::getId, EdFileInfo::getFileId, EdFileInfo::getFileVersion, EdFileInfo::getPreVersion, EdFileInfo::getFileCode, EdFileInfo::getEffectFlag) .select(EdFileInfo::getId, EdFileInfo::getFileId, EdFileInfo::getFileVersion, EdFileInfo::getPreVersion, EdFileInfo::getFileCode, EdFileInfo::getEffectFlag, EdFileInfo::getFileName)
.eq(EdFileInfo::getFileId, fileId)); .eq(EdFileInfo::getFileId, fileId));
List<FileVersionViewVO> fileVersionViewVOS = BeanUtil.copyToList(edFileInfos, FileVersionViewVO.class); List<FileVersionViewVO> fileVersionViewVOS = BeanUtil.copyToList(edFileInfos, FileVersionViewVO.class);
return ElectromagneticResultUtil.success(fileVersionViewVOS); return ElectromagneticResultUtil.success(fileVersionViewVOS);
@ -905,7 +903,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setPrjDir(false); .setPrjDir(false);
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(parentFileInfo.getFilePath()); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
fileSystemService.save(file.getInputStream(), fileDestPath); fileSystemService.save(file.getInputStream(), fileDestPath);
} else if (strategy == 3) { } else if (strategy == 3) {
// 文件名加”_1“，存为新文件 // 文件名加”_1“，存为新文件
@ -932,7 +930,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
.setPrjDir(false); .setPrjDir(false);
resetFileInfoName(newEdFileInfo); resetFileInfoName(newEdFileInfo);
this.baseMapper.insert(newEdFileInfo); this.baseMapper.insert(newEdFileInfo);
String fileDestPath = commonService.getFileSysPath(parentFileInfo.getFilePath()); String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
fileSystemService.save(file.getInputStream(), fileDestPath); fileSystemService.save(file.getInputStream(), fileDestPath);
} }

8
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -103,7 +103,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.setSort(1) .setSort(1)
.setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr))
.setCreatedTime(now) .setCreatedTime(now)
.setUpdateTime(now) .setUpdatedTime(now)
.setCreatedBy(currentUserId) .setCreatedBy(currentUserId)
.setUpdatedBy(currentUserId); .setUpdatedBy(currentUserId);
this.save(fileInfo); this.save(fileInfo);
@ -152,7 +152,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.eq(EdFileInfo::getId, prjId) .eq(EdFileInfo::getId, prjId)
.set(EdFileInfo::getFileName, newPrjName) .set(EdFileInfo::getFileName, newPrjName)
.set(EdFileInfo::getUpdatedBy, UserThreadLocal.getUserId()) .set(EdFileInfo::getUpdatedBy, UserThreadLocal.getUserId())
.set(EdFileInfo::getUpdateTime, new Date())); .set(EdFileInfo::getUpdatedTime, new Date()));
fileSystemService.renameFile(commonService.getEleDataPath(), oldPrjName, newPrjName); fileSystemService.renameFile(commonService.getEleDataPath(), oldPrjName, newPrjName);
} catch (Exception e) { } catch (Exception e) {
String info = StrFormatter.format("修改工程名异常--->{}，{}", newPrjName, e.getMessage()); String info = StrFormatter.format("修改工程名异常--->{}，{}", newPrjName, e.getMessage());
@ -335,7 +335,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.setFilePath(targetParentFile.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) .setFilePath(targetParentFile.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId)
.setSort(targetTmpEdFiles.size() + 1) .setSort(targetTmpEdFiles.size() + 1)
.setCreatedTime(now) .setCreatedTime(now)
.setUpdateTime(now) .setUpdatedTime(now)
.setCreatedBy(currentUserId) .setCreatedBy(currentUserId)
.setUpdatedBy(currentUserId); .setUpdatedBy(currentUserId);
this.save(targetFile); this.save(targetFile);
@ -376,7 +376,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
.eq(EdFileInfo::getId, id)); .eq(EdFileInfo::getId, id));
String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath()); String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath());
this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class)
.set(EdFileInfo::getUpdateTime, now) .set(EdFileInfo::getUpdatedTime, now)
.set(EdFileInfo::getUpdatedBy, currentUserId) .set(EdFileInfo::getUpdatedBy, currentUserId)
.eq(EdFileInfo::getId, id) .eq(EdFileInfo::getId, id)
.set(EdFileInfo::getFileName, newFolderName)); .set(EdFileInfo::getFileName, newFolderName));