diff --git a/pom.xml b/pom.xml index 267d1e6..e27ac4d 100644 --- a/pom.xml +++ b/pom.xml @@ -261,6 +261,13 @@ <artifactId>dynamic-datasource-spring-boot-starter</artifactId> <version>3.5.0</version> </dependency> + + <dependency> + <groupId>net.sourceforge.tess4j</groupId> + <artifactId>tess4j</artifactId> + <version>4.5.3</version> + </dependency> + </dependencies> <build> diff --git a/src/main/java/com/pashanhoo/common/util/fileupload/MinioUtil.java b/src/main/java/com/pashanhoo/common/util/fileupload/MinioUtil.java index 0d7d85f..2754e56 100644 --- a/src/main/java/com/pashanhoo/common/util/fileupload/MinioUtil.java +++ b/src/main/java/com/pashanhoo/common/util/fileupload/MinioUtil.java @@ -57,7 +57,7 @@ public class MinioUtil { String expandName = StringUtils.getFilenameExtension(file.getOriginalFilename()); // 文件名 String fileName = originalFilename.substring(0, originalFilename.indexOf(".")); - String contentType = contentTypeMap.get(expandName.toLowerCase()); + String contentType = CONTENT_TYPE_MAP.get(expandName.toLowerCase()); // 下载地址 String saveUrl = savePath + "/" + originalFilename; // 浏览器直接预览地址,针对图片 @@ -131,7 +131,7 @@ public class MinioUtil { */ public FileAttribute transferToMinio(InputStream inputStream, String fileName, String expandName, String fileSize) throws IOException { String savePath = FileAttachmentUtil.getSavePath(UUID.randomUUID().toString()); - String contentType = contentTypeMap.get(expandName.toLowerCase()); + String contentType = CONTENT_TYPE_MAP.get(expandName.toLowerCase()); // 下载地址 String saveUrl = savePath + "/" + fileName + expandName; // 浏览器直接预览地址,针对图片 @@ -160,7 +160,11 @@ public class MinioUtil { return minioConfig.getType() + minioConfig.getEndpoint() + "/file/" + saveUrl; } - private static final Map<String, String> contentTypeMap = new HashMap<>() { + public InputStream getObject(String objectName) throws Exception{ + return minioClient.getObject(GetObjectArgs.builder().bucket(minioConfig.getBucket()).object(objectName).build()); + } + + private static final Map<String, String> CONTENT_TYPE_MAP = new HashMap<>() { { put("323", "text/h323"); put("3gp", "video/3gpp"); diff --git a/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java b/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java index 270a065..facc5f9 100644 --- a/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java +++ b/src/main/java/com/pashanhoo/replenish/controller/DgArchivesReplenishController.java @@ -1,17 +1,17 @@ package com.pashanhoo.replenish.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.pashanhoo.common.Result; import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest; import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO; import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest; import com.pashanhoo.replenish.service.DgArchivesReplenishService; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -33,8 +33,10 @@ public class DgArchivesReplenishController { @PostMapping("insertDgArchivesReplenish") @ApiOperation("新增档案补录信息") public Result insertDgArchivesReplenish(@RequestBody AddDgArchivesReplenishRequest request){ - if(dgarchivesreplenishService.insertDgArchivesReplenish(request)){ - return Result.ok(); + //生成案卷标识码 + String bsmArchive = IdWorker.get32UUID(); + if(dgarchivesreplenishService.insertDgArchivesReplenish(request,bsmArchive)){ + return Result.ok(bsmArchive); } return Result.error("新增失败"); } diff --git a/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java b/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java index 8512695..0227713 100644 --- a/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java +++ b/src/main/java/com/pashanhoo/replenish/service/DgArchivesReplenishService.java @@ -20,9 +20,10 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish * 新增记录 * * @param request + * @param bsmArchive 主键 * @return */ - boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request); + boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request,String bsmArchive); /** * 根据主键查询记录详情 diff --git a/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java b/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java index b24020a..d66e5dc 100644 --- a/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java +++ b/src/main/java/com/pashanhoo/replenish/service/impl/DgArchivesReplenishServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pashanhoo.archive.entity.ArchiveStatus; @@ -104,14 +103,12 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen * 新增记录 * * @param request + * @param bsmArchive 生成主键 * @return */ @Override @Transactional(rollbackFor = Exception.class) - public boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request) { - - //生成案卷标识码 - String bsmArchive = IdWorker.get32UUID(); + public boolean insertDgArchivesReplenish(AddDgArchivesReplenishRequest request,String bsmArchive) { //案卷基本信息 AddDgArchivesRequest addDgArchivesRequest = request.getAddDgArchivesRequest();