ocr、文件上传修改

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/ocr/BusinessLicenseOcrResponse.java

@@ -8,10 +8,8 @@ import lombok.Setter;
 @Setter
 public class BusinessLicenseOcrResponse extends AbstractAtsResponse {
 
-    private String imageUrl;
-
+    private String imageUrl;//图片地址
     private String scope;//经营范围
-
     private String makeBy;//组成形式
     private String legalPerson;//法人
     private String idNum;//证件编号
@@ -21,7 +19,6 @@ public class BusinessLicenseOcrResponse extends AbstractAtsResponse {
     private String sCreditCode;//社会信用代码
     private String paidInCapital;//实收资本
     private String startEffectiveDate;//有效期起始日期
-
     private String approvalDate;//核准日期
     private String setUpDate;//成立日期
     private String taxRegNum;//税务登记号
@@ -29,10 +26,10 @@ public class BusinessLicenseOcrResponse extends AbstractAtsResponse {
     private String regAuthority;//登记机关
     private String type;//类型
 
-    private String code;
-    private String respCode;
-    private String respMessage;
-    private String status;
-    private String statusDesc;
-    private String ocrResultId;
+    private String code;            // 状态码
+    private String respCode;        // 响应代码
+    private String respMessage;     // 响应消息
+    private String status;          // 状态
+    private String statusDesc;      // 状态描述
+    private String ocrResultId;     // OCR结果ID
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/ocr/IdCardOcrResponse.java

@@ -8,24 +8,24 @@ import lombok.Setter;
 @Setter
 public class IdCardOcrResponse extends AbstractAtsResponse {
 
-    private String imageUrl;
-    private String birthday;
-    private String respMessage;
-    private String statusDesc;
-    private String code;
-    private String begindate;
-    private String address;
-    private String agency;
-    private String gender;
-    private String nation;
-    private String idno;
-    private String idtype;
-    private String enddate;
-    private String identityId;
-    private String name;
-    private Integer imageType;
-    private String respCode;
-    private String status;
+    private String imageUrl;        // 图片URL
+    private String birthday;        // 出生日期
+    private String begindate;       // 有效期起始日期
+    private String address;         // 住址
+    private String agency;          // 签发机关
+    private String gender;          // 性别
+    private String nation;          // 民族
+    private String idno;            // 身份证号码
+    private String idtype;          // 身份证类型
+    private String enddate;         // 有效期结束日期
+    private String identityId;      // 身份ID
+    private String name;            // 姓名
+    private Integer imageType;      // 图片类型
 
-    private String ocrResultId;
+    private String code;            // 状态码
+    private String respCode;        // 响应代码
+    private String respMessage;     // 响应消息
+    private String status;          // 状态
+    private String statusDesc;      // 状态描述
+    private String ocrResultId;     // OCR结果ID
 }

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/ocr/VehicleLicenseOcrResponse.java

@@ -8,38 +8,35 @@ import lombok.Setter;
 @Setter
 public class VehicleLicenseOcrResponse extends AbstractAtsResponse {
 
-    private String imageUrl;//图片地址
-    private String towing;
-    private String note;
-    private String code;
-    private String vehicle;
-    private String character;
-    private String file;
-    private String engine;
-    /**
-     * 载人
-     */
-    private String apc;
-    private String alc;
-    private String model;
-    private String vin;//车辆识别代码
-    private String man;
-    private String inspection;
-    private String respMessage;
-    private String statusDesc;
-    private String address;
-    private String issue;
-    private String gross;
-    private String plate_a;
-    private String plate_b;
-    private String unladen;
-    private String codeNo;
-    private String driveLicenseOcrId;
-    private String overall;
-    private String pictureSize;
-    private String respCode;
-    private String status;
-    private String register;
+    private String imageUrl;         // 图片URL
+    private String towing;           // 拖挂车类型
+    private String note;             // 备注
+    private String vehicle;          // 车辆类型
+    private String character;        // 车辆特征
+    private String file;             // 档案编号
+    private String engine;           // 发动机号码
+    private String apc;              // 允许的乘客容量
+    private String alc;              // 允许的载重量
+    private String model;            // 车辆型号
+    private String vin;              // 车辆识别号码
+    private String man;              // 制造商
+    private String inspection;       // 检验有效期至
+    private String address;          // 住址
+    private String issue;            // 发证机关
+    private String gross;            // 总质量
+    private String plate_a;          // 车牌号（前）
+    private String plate_b;          // 车牌号（后）
+    private String unladen;          // 整备质量
+    private String codeNo;           // 代码编号
+    private String driveLicenseOcrId; // 驾驶证OCR结果ID
+    private String overall;          // 总体描述
+    private String pictureSize;      // 图片尺寸
+    private String register;         // 注册日期
 
-    private String ocrResultId;
+    private String code;            // 状态码
+    private String respCode;        // 响应代码
+    private String respMessage;     // 响应消息
+    private String status;          // 状态
+    private String statusDesc;      // 状态描述
+    private String ocrResultId;     // OCR结果ID
 }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwCardDetailsManagerImpl.java

@@ -10,7 +10,7 @@ import cn.com.taiji.core.entity.invw.InvwCardDetails;
 import cn.com.taiji.core.entity.invw.InvwQryCardBatch;
 import cn.com.taiji.core.entity.invw.InvwQryCards;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardBatchRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardsRepo;
@@ -46,7 +46,7 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
     @Autowired
     private InvwWarehouseRepo warehouseRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
     @Autowired
     private InvwQryCardBatchRepo qryCardBatchRepo;
     @Autowired
@@ -122,7 +122,7 @@ public class InvwCardDetailsManagerImpl extends AbstractInvwManager implements I
         Map<String, String> storeMap = storeList.stream().collect(Collectors.toMap(InvwWarehouse::getCode, InvwWarehouse::getName));
         List<InvwCardDetailsExcelModel> excelModelList2 = excelModelList.stream().peek(t -> t.setStoreName(storeMap.get(t.getStoreCode()))).collect(Collectors.toList());
         File file = EasyExcelUtil.exportExcelFile(InvwCardDetailsExcelModel.class, excelModelList2, "卡设备");
-        String filePath = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String filePath = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO responseDTO = new CommExcelFileResponseDTO();
         return responseDTO.setFilePath(filePath);
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardBatchManagerImpl.java

@@ -4,7 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryCardBatch;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardBatchRepo;
 import cn.com.taiji.core.repo.request.invw.InvwQryCardBatchPageRequest;
 import cn.com.taiji.invw.dto.card.InvwQryCardBatchPageRequestDTO;
@@ -27,7 +27,7 @@ public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements
     @Autowired
     private InvwQryCardBatchRepo invwQryCardBatchRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
     @Override
     public Pagination page(InvwQryCardBatchPageRequestDTO request) {
@@ -62,7 +62,7 @@ public class InvwQryCardBatchManagerImpl extends AbstractCommManager implements
         // 写入数据
         EasyExcel.write(file, InvwQryCardBatchExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String uploadUrl = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/card/InvwQryCardsManagerImpl.java

@@ -4,7 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryCards;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryCardsRepo;
 import cn.com.taiji.core.repo.request.invw.InvwQryCardsPageRequest;
 import cn.com.taiji.invw.dto.card.InvwQryCardsPageRequestDTO;
@@ -27,7 +27,7 @@ public class InvwQryCardsManagerImpl extends AbstractCommManager implements Invw
     @Autowired
     private InvwQryCardsRepo invwQryCardsRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
     @Override
     public Pagination page(InvwQryCardsPageRequestDTO request) {
@@ -62,7 +62,7 @@ public class InvwQryCardsManagerImpl extends AbstractCommManager implements Invw
         // 写入数据
         EasyExcel.write(file, InvwQryCardsExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String uploadUrl = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

@@ -14,7 +14,7 @@ import cn.com.taiji.core.entity.invw.InvwCardDetails;
 import cn.com.taiji.core.entity.invw.InvwEnterApply;
 import cn.com.taiji.core.entity.invw.InvwEnterApplyDetails;
 import cn.com.taiji.core.entity.invw.InvwObuDetails;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwEnterApplyDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwEnterApplyRepo;
@@ -56,7 +56,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
     @Autowired
     private InvwObuDetailsRepo obuDetailsRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
 
     @Override
@@ -161,7 +161,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
 
     @Override
     public InvwEnterApplyParseExcelResponseDTO parseExcel(InvwEnterApplyParseExcelRequestDTO dto) throws ManagerException {
-        File file = minioUtile.getFileByUrl(dto.getExcelUrl());
+        File file = minioUtil.getFileByUrl(dto.getExcelUrl());
         List<EnterApplyDetailModel> modelList = EasyExcelUtil.readExcelColToModelList(file, EnterApplyDetailModel.class);
         return new InvwEnterApplyParseExcelResponseDTO(modelList);
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwObuDetailsManagerImpl.java

@@ -8,7 +8,7 @@ import cn.com.taiji.core.entity.dict.basic.ObuType;
 import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
 import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.*;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwObuDetailsPageRequest;
 import cn.com.taiji.invw.dto.obu.InvwObuDetailsExportRequestDTO;
@@ -44,7 +44,7 @@ public class InvwObuDetailsManagerImpl extends AbstractInvwManager implements In
     @Autowired
     private InvwWarehouseRepo warehouseRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
     @Autowired
     private InvwQryObuBatchRepo qryObuBatchRepo;
     @Autowired
@@ -137,7 +137,7 @@ public class InvwObuDetailsManagerImpl extends AbstractInvwManager implements In
         Map<String, String> storeMap = storeList.stream().collect(Collectors.toMap(InvwWarehouse::getCode, InvwWarehouse::getName));
         List<InvwObuDetailsExcelModel> excelModelList2 = excelModelList.stream().peek(t -> t.setStoreName(storeMap.get(t.getStoreCode()))).collect(Collectors.toList());
         File file = EasyExcelUtil.exportExcelFile(InvwObuDetailsExcelModel.class, excelModelList2, "签设备");
-        String filePath = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String filePath = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO responseDTO = new CommExcelFileResponseDTO();
         return responseDTO.setFilePath(filePath);
     }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwQryObuBatchManagerImpl.java

@@ -4,7 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryObuBatch;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObuBatchRepo;
 import cn.com.taiji.core.repo.request.invw.InvwQryObuBatchPageRequest;
 import cn.com.taiji.invw.dto.comm.CommExcelFileResponseDTO;
@@ -27,7 +27,7 @@ public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements I
     @Autowired
     private InvwQryObuBatchRepo invwQryObuBatchRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
     @Override
     public Pagination page(InvwQryObuBatchPageRequestDTO request) {
@@ -62,7 +62,7 @@ public class InvwQryObuBatchManagerImpl extends AbstractCommManager implements I
         // 写入数据
         EasyExcel.write(file, InvwQryObuBatchExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String uploadUrl = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/obu/InvwQryObusManagerImpl.java

@@ -4,7 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.dict.BucketFileBus;
 import cn.com.taiji.core.entity.invw.InvwQryObus;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.InvwQryObusRepo;
 import cn.com.taiji.core.repo.request.invw.InvwQryObusPageRequest;
 import cn.com.taiji.invw.dto.comm.CommExcelFileResponseDTO;
@@ -27,7 +27,7 @@ public class InvwQryObusManagerImpl extends AbstractCommManager implements InvwQ
     @Autowired
     private InvwQryObusRepo invwQryObusRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
     @Override
     public Pagination page(InvwQryObusPageRequestDTO request) {
@@ -62,7 +62,7 @@ public class InvwQryObusManagerImpl extends AbstractCommManager implements InvwQ
         // 写入数据
         EasyExcel.write(file, InvwQryObusExcelModel.class).sheet(excelName).doWrite(excelModels);
         // 上传文件
-        String uploadUrl = minioUtile.fileUploadHttp(file, BucketFileBus.INVW);
+        String uploadUrl = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
         CommExcelFileResponseDTO response = new CommExcelFileResponseDTO();
         response.setFilePath(uploadUrl);
         return response;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/stocktaking/InvwStocktakingInfoManagerImpl.java

@@ -11,7 +11,7 @@ import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwStocktakingInfo;
 import cn.com.taiji.core.entity.invw.InvwStocktakingResult;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwStocktakingInfoPageRequest;
 import cn.com.taiji.invw.dto.stocktaking.*;
@@ -45,7 +45,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
     @Autowired
     private InvwStocktakingInfoRepo stocktakingInfoRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
     @Autowired
     private InvwCardDetailsRepo cardDetailsRepo;
     @Autowired
@@ -80,7 +80,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
         File file = null;
         try {
             // 从URL获取导入文件
-            file = minioUtile.getFileByUrl(req.getFileUrl());
+            file = minioUtil.getFileByUrl(req.getFileUrl());
             if (file == null) {
                 throw new ManagerException("无法从提供的URL获取文件");
             }
@@ -219,7 +219,7 @@ public class InvwStocktakingInfoManagerImpl extends AbstractInvwManager implemen
         try {
             File tempFile = File.createTempFile("temp_error_设备移除错误反馈表", ".xlsx");
             EasyExcel.write(tempFile, InvwStocktakingInfoRemoveModel.class).sheet("设备移除错误反馈表").doWrite(result);
-            return minioUtile.fileUploadHttp(tempFile, BucketFileBus.INVW);
+            return minioUtil.fileUploadHttp(tempFile, BucketFileBus.INVW);
         } catch (Exception e) {
             throw e;
         }

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/transfer/InvwTransferApplyManagerImpl.java

@@ -10,7 +10,7 @@ import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.invw.InvwTransferApply;
 import cn.com.taiji.core.entity.invw.InvwTransferApplyDetails;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
-import cn.com.taiji.core.manager.tools.minio.MinioUtile;
+import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.invw.*;
 import cn.com.taiji.core.repo.request.invw.InvwTransferApplyPageRequest;
 import cn.com.taiji.invw.dto.transfer.*;
@@ -44,7 +44,7 @@ public class InvwTransferApplyManagerImpl extends AbstractInvwManager implements
     @Autowired
     private InvwObuDetailsRepo obuDetailsRepo;
     @Autowired
-    private MinioUtile minioUtile;
+    private MinioUtil minioUtil;
 
     @Override
     public Pagination page(InvwTransferApplyPageRequestDTO req) {
@@ -184,7 +184,7 @@ public class InvwTransferApplyManagerImpl extends AbstractInvwManager implements
     @Override
     public InvwTransferApplyImportResponseDTO importData(InvwTransferApplyImportRequestDTO req) throws ManagerException {
         //  获取导入文件
-        File file = minioUtile.getFileByUrl(req.getFileUrl());
+        File file = minioUtil.getFileByUrl(req.getFileUrl());
         // 读取文件数据
         List<InvwTransferApplyDetailsModel> models = EasyExcelUtil.readExcelColToModelList(file, InvwTransferApplyDetailsModel.class);
         if (models.size() == 0) {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/BaiduOcrUtil.java

@@ -458,7 +458,7 @@ public class BaiduOcrUtil {
     }
 
     public static void main(String[] args) {
-        String imagePath = "C:\\Users\\宋严俊\\Downloads\\1fd343c2440d429f1ac57a4af33f92ff.jpeg"; // 图片文件的路径
+        String imagePath = "C:\\Users\\32258\\Desktop\\gy\\ocr测试图片\\身份证.jpg"; // 图片文件的路径
         try {
             // 读取图片文件
             File file = new File(imagePath);
@@ -480,7 +480,7 @@ public class BaiduOcrUtil {
 //            String s = "http://192.168.100.63:8123/rest/2.0/ocr/v1/idcard?access_token=\"24.5ef02634e73ed6f7d9d161f706b6c4ea.2592000.1729009172.282335-26580024\"";
 //            System.out.println(s.replaceAll("\"",""));
             BaiduOcrUtil baiduOcrUtil = new BaiduOcrUtil();
-            baiduOcrUtil.ocrBusinessLicenseRecognize(base64Image);
+            baiduOcrUtil.ocrIdCardRecognize(base64Image,"front");
         } catch (Exception e) {
             e.printStackTrace();
         }