diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index a2838f68..c96d3552 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.IntekeyUtils; +import com.jero.common.util.SnowflakeUtils; import com.jero.common.util.UUIDUtils; import com.jero.common.util.obs.ObsBootUtil; import com.jero.modules.laws.documenttool.mapper.DocumentSplitMapper; @@ -94,6 +95,8 @@ public class FileSpiltService { private ILawsDomesticStandardService lawsDomesticStandardService; @Autowired private ILawsEnterpriseStandardService lawsEnterpriseStandardService; + @Autowired + private IOSSFileService ossFileService; @Value("${jero.path.upload}") private String filePath; @@ -944,13 +947,20 @@ public class FileSpiltService { XWPFPictureData pictureData = p.getDocument().getPictureDataByID(pictureId); String imageName = UUIDUtils.randomUUID10() + pictureData.getFileName(); byte[] bytev = pictureData.getData(); - String filepathandname = filePathCos + "/" + imageName; +// String filepathandname = filePathCos + "/" + imageName; try { - String path = splitUrl+imageName; +// String path = splitUrl+imageName; // MinioUtil.uploadByte(bytev, filepathandname); - ObsBootUtil.upload(new ByteArrayInputStream(bytev), filepathandname); - String imgCon = path; - String imgConVal = ""; + InputStream inputStream = new ByteArrayInputStream(bytev); + MultipartFile file = new MockMultipartFile(imageName, imageName,ContentType.APPLICATION_OCTET_STREAM.toString(),inputStream); + String upload = ObsBootUtil.upload(file, "temp"); + OSSFile ossFile = new OSSFile(); + ossFile.setId(String.valueOf(SnowflakeUtils.snowflake())); + ossFile.setFileName(file.getName()); + ossFile.setUrl(upload); + ossFileService.save(ossFile); + String imgCon = splitUrl+upload.replace("temp\\", ""); + String imgConVal = ""; message.getItemsCondi().add(imgConVal); message.setItemContent(message.getItemContent() + imgConVal); itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.IMG.getValue(), imgCon, message.getItemsCondi().size(), null));