yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

案件登记表,培训记录表文件上传查询修改

master
徐杰盟 2024-09-25 17:38:57 +08:00
parent 20497ec5ec
commit 05a3ac1707
4 changed files with 118 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
View File

@ -77,8 +77,8 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
boolean result = service.save(dto);
if (result){
fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles1(), getGroupId(), String.valueOf( dto.getId()),"1");
fileService.saveFile(dto.getFiles2(), getGroupId(), String.valueOf( dto.getId()),"2");
}
return R.ok(result ? dto : null);
}
@ -108,8 +108,8 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
dto.setUpdateTime(new Date());
boolean result = service.updateById(dto);
if (result){
fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles1(), getGroupId(), String.valueOf( dto.getId()),"1");
fileService.saveFile(dto.getFiles2(), getGroupId(), String.valueOf( dto.getId()),"2");
}
return R.ok(result ? dto : null);
}
@ -128,8 +128,8 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
throw new IllegalArgumentException("当前数据不存在");
}
o.setFiles1(fileService.getFiles(getGroupId(1),String.valueOf(o.getId())));
o.setFiles2(fileService.getFiles(getGroupId(2),String.valueOf(o.getId())));
o.setFiles1(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"1"));
o.setFiles2(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"2"));
return R.ok(o);
}
@ -274,7 +274,5 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
public String getGroupId() {
return "personnelPlanLog";
}
public String getGroupId(int num) {
return "personnelPlanLog" + num;
}
}

54
src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
View File

@ -59,15 +59,15 @@ public class SzCaseController extends AbstractCommonFileController{
if (result){
fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles3(), getGroupId(3), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles4(), getGroupId(4), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles5(), getGroupId(5), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles6(), getGroupId(6), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles7(), getGroupId(7), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles8(), getGroupId(8), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles9(), getGroupId(9), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles1(), getGroupId(), String.valueOf( dto.getId()),"1");
fileService.saveFile(dto.getFiles2(), getGroupId(), String.valueOf( dto.getId()),"2");
fileService.saveFile(dto.getFiles3(), getGroupId(), String.valueOf( dto.getId()),"3");
fileService.saveFile(dto.getFiles4(), getGroupId(), String.valueOf( dto.getId()),"4");
fileService.saveFile(dto.getFiles5(), getGroupId(), String.valueOf( dto.getId()),"5");
fileService.saveFile(dto.getFiles6(), getGroupId(), String.valueOf( dto.getId()),"6");
fileService.saveFile(dto.getFiles7(), getGroupId(), String.valueOf( dto.getId()),"7");
fileService.saveFile(dto.getFiles8(), getGroupId(), String.valueOf( dto.getId()),"8");
fileService.saveFile(dto.getFiles9(), getGroupId(), String.valueOf( dto.getId()),"9");
}
return R.ok(result ? dto : null);
@ -92,15 +92,15 @@ public class SzCaseController extends AbstractCommonFileController{
boolean result = service.updateById(dto);
if (result){
fileService.saveFile(dto.getFiles1(), getGroupId(1), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles2(), getGroupId(2), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles3(), getGroupId(3), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles4(), getGroupId(4), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles5(), getGroupId(5), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles6(), getGroupId(6), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles7(), getGroupId(7), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles8(), getGroupId(8), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles9(), getGroupId(9), String.valueOf( dto.getId()));
fileService.saveFile(dto.getFiles1(), getGroupId(), String.valueOf( dto.getId()),"1");
fileService.saveFile(dto.getFiles2(), getGroupId(), String.valueOf( dto.getId()),"2");
fileService.saveFile(dto.getFiles3(), getGroupId(), String.valueOf( dto.getId()),"3");
fileService.saveFile(dto.getFiles4(), getGroupId(), String.valueOf( dto.getId()),"4");
fileService.saveFile(dto.getFiles5(), getGroupId(), String.valueOf( dto.getId()),"5");
fileService.saveFile(dto.getFiles6(), getGroupId(), String.valueOf( dto.getId()),"6");
fileService.saveFile(dto.getFiles7(), getGroupId(), String.valueOf( dto.getId()),"7");
fileService.saveFile(dto.getFiles8(), getGroupId(), String.valueOf( dto.getId()),"8");
fileService.saveFile(dto.getFiles9(), getGroupId(), String.valueOf( dto.getId()),"9");
}
return R.ok(result ? dto : null);
}
@ -151,15 +151,15 @@ public class SzCaseController extends AbstractCommonFileController{
throw new IllegalArgumentException("当前数据不存在");
}
o.setFiles1(fileService.getFiles(getGroupId(1),String.valueOf(o.getId())));
o.setFiles2(fileService.getFiles(getGroupId(2),String.valueOf(o.getId())));
o.setFiles3(fileService.getFiles(getGroupId(3),String.valueOf(o.getId())));
o.setFiles4(fileService.getFiles(getGroupId(4),String.valueOf(o.getId())));
o.setFiles5(fileService.getFiles(getGroupId(5),String.valueOf(o.getId())));
o.setFiles6(fileService.getFiles(getGroupId(6),String.valueOf(o.getId())));
o.setFiles7(fileService.getFiles(getGroupId(7),String.valueOf(o.getId())));
o.setFiles8(fileService.getFiles(getGroupId(8),String.valueOf(o.getId())));
o.setFiles9(fileService.getFiles(getGroupId(9),String.valueOf(o.getId())));
o.setFiles1(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"1"));
o.setFiles2(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"2"));
o.setFiles3(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"3"));
o.setFiles4(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"4"));
o.setFiles5(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"5"));
o.setFiles6(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"6"));
o.setFiles7(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"7"));
o.setFiles8(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"8"));
o.setFiles9(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"9"));
return R.ok(o);
}

20
src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
View File

@ -35,6 +35,26 @@ public interface FileAssociationsMapper extends BaseMapper<FileAssociations> {
</script>
""")
List<FileAssociations> getFiles(@Param("tableName") String tableName,@Param("businessId") String businessId);
@Select("""
<script>
SELECT
fa.*,
fd.file_name,
fd.file_size,
fd.file_path
FROM
file_associations fa
LEFT JOIN file_descriptor fd ON fa.file_id = fd.file_id
WHERE
fa.del = '1'
AND fa.business_id = #{businessId}
AND fa."table_name" = #{tableName}
AND fd.group_id = #{tableName}
AND fd.type = #{type}
ORDER BY fa.tm desc
</script>
""")
List<FileAssociations> getFiles(@Param("tableName") String tableName,@Param("businessId") String businessId,@Param("type") String type);
@Select("""
<script>

64
src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java
View File

@ -85,6 +85,65 @@ public class FileAssociationsService extends ServiceImpl<FileAssociationsMapper,
}
}
@CacheEvict(value = THIS_REDIS_KEY, key = "#p1 +':*'", allEntries = true)
public void saveFile(List<FileAssociations> files, String tableName, String businessId, String type) {
if (CollectionUtils.isEmpty(files)) {
log.info("fileIds is null!");
}
// 查询是否添加
List<FileAssociations> dbList = this.lambdaQuery()
.eq(FileAssociations::getTableName, tableName)
.eq(FileAssociations::getBusinessId, businessId)
.eq(FileAssociations::getType, type)
.eq(FileAssociations::getDel, REC)
.list();
if (CollectionUtils.isNotEmpty(dbList)) {
Set<Long> fileIds = dbList.stream().map(FileAssociations::getFileId)
.collect(Collectors.toSet());
// 删除已添加数据, 删除重复数据 删除不成功即新数据
files = files.stream()
.filter(fileAssociations -> !fileIds.remove(fileAssociations.getFileId()))
.collect(Collectors.toList());
// if (CollectionUtils.isNotEmpty(files)) {
// 删除
if (CollectionUtils.isNotEmpty(fileIds) && this.lambdaUpdate()
.set(FileAssociations::getDel, DEL)
.eq(FileAssociations::getTableName, tableName)
.eq(FileAssociations::getBusinessId, businessId)
.eq(FileAssociations::getType, type)
.in(FileAssociations::getFileId, fileIds)
.update()) {
log.info("delete file {} success!", fileIds);
}
// }
}
// 做新增
if (CollectionUtils.isNotEmpty(files)) {
files.forEach(fileId -> {
fileId.setId(IdWorker.getId());
fileId.setTableName(tableName);
fileId.setType(type);
fileId.setBusinessId(businessId);
});
if (!this.saveBatch(files)) {
log.error("save file error!");
}
}
}
@CacheEvict(value = THIS_REDIS_KEY, key = "#p1 +':*'", allEntries = true)
public void saveFileNotDel(List<FileAssociations> files, String tableName, String businessId, String type) {
@ -149,6 +208,11 @@ public class FileAssociationsService extends ServiceImpl<FileAssociationsMapper,
return this.baseMapper.getFiles(tName,bId);
}
@Cacheable(value = THIS_REDIS_KEY, key = "#p0 +':'+ #p1 +':'+ #p2", unless = "false")
public List<FileAssociations> getFiles(String tName, String bId,String num) {
return this.baseMapper.getFiles(tName,bId,num);
}
public void save(List<FileAssociations> attachList,String businessId, String tableName,String type) {
if (attachList != null && !attachList.isEmpty()) {
for (FileAssociations attach : attachList) {