diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index 0314b49f..4fac10d8 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -361,20 +361,32 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); List exportFiles = null; if (Objects.nonNull(projectId)){ qw.lambda().eq(ExportFile::getProjectId, projectId); qw.lambda().eq(ExportFile::getModule, module); exportFiles = exportFileMapper.selectList(qw); + } else if (Objects.nonNull(designItemDetailId)){ + DesignItemDetailCanvas designItemDetailCanvas = designItemDetailService.getDIDCByDesignItemDetailId(designItemDetailId); + if (Objects.nonNull(designItemDetailCanvas) && Objects.nonNull(designItemDetailCanvas.getExportFileId())){ + qw.lambda().eq(ExportFile::getId, designItemDetailCanvas.getExportFileId()); + qw.lambda().eq(ExportFile::getModule, module); + exportFiles = exportFileMapper.selectList(qw); + } } +// String upload = minioUtil.upload("aida-users", userHolder.getId() + "/exportFile", file); if (CollectionUtil.isNotEmpty(exportFiles)) { ExportFile exportFile = exportFiles.get(0); - exportFile.setUrl(upload); - exportFileMapper.updateById(exportFile); + // 更新画布信息时,只重新上传图片,不用修改数据库url + String url = exportFile.getUrl(); + String path = url.substring(url.indexOf("/") + 1); + minioUtil.upload("aida-users", path, file, null); +// exportFile.setUrl(upload); +// exportFileMapper.updateById(exportFile); }else { + String upload = minioUtil.upload("aida-users", userHolder.getId() + "/exportFile", file); ExportFile exportFile = new ExportFile(); exportFile.setProjectId(projectId); exportFile.setModule(module); @@ -1326,9 +1338,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); - wrapper.eq("id", id) - .eq("project_id", projectId) - .set("is_deleted", 1); + wrapper.lambda().eq(ToProductImageResult::getProjectId, projectId) + .eq(ToProductImageResult::getId, id).or().eq(ToProductImageResult::getElementId, id) + .set(ToProductImageResult::getIsDeleted, 1); + int update = toProductImageResultMapper.update(null, wrapper); log.info("删除 {} 结果, id={}, 影响行数={}", type, id, update);