Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -156,8 +156,19 @@ public enum PerformanceResultEnum implements ResultEnum {
     OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1853,"当前借款单状态不是待付款"),
     OWNER_LOAN_PAYMENT_STATUS_ERROR(1854, "执行借款审批失败,请稍后重试"),
     OWNER_LOAN_PAY_STATUS_ERROR(1855, "付款失败"),
-    DATA_STATUS_ERROR(1856, "当前状态有误")
+    DATA_STATUS_ERROR(1856, "当前状态有误"),
 
+    /**
+     * 磅单OCR识别
+     */
+    OCR_RECOGNITION_ERROR(2101, "OCR识别错误"),
+    OCR_RECOGNITION_REPEAT(2102, "同一个运单只能识别一次"),
+    LOAD_TIME_BEFORE_ARRIVE_SEND_TIME(2103, "装货时间不可早于到达货源地时间"),
+    LOAD_TIME_AFTER_NOW(2104, "装货时间不可晚于当前时间"),
+    LOAD_TIME_AFTER_FIRST_LOAD_TIME(2105, "装货时间不可晚于首次提交时间"),
+    UNLOAD_TIME_BEFORE_ARRIVE_RECEIVE_TIME(2106, "交货时间不可早于到达目的地时间"),
+    UNLOAD_TIME_AFTER_NOW(2107, "交货时间不可晚于当前时间"),
+    UNLOAD_TIME_AFTER_FIRST_UNLOAD_TIME(2108, "交货时间不可晚于首次提交时间"),
     ;
     private final int code;
     private final String msg;

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadAndUnloadAgainParam.java

@@ -47,11 +47,9 @@ public class OrderChildLoadAndUnloadAgainParam extends PositionParam {
     private List<String> unloadImageList;
 
     @ApiModelProperty(value = "装货时间")
-    @NotBlank(message = "装货时间不能为空")
     private String loadTime;
 
     @ApiModelProperty(value = "交货时间")
-    @NotBlank(message = "交货时间不能为空")
     private String unloadTime;
 
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadParam.java

@@ -5,7 +5,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -34,6 +33,5 @@ public class OrderChildLoadParam extends PositionParam {
     private List<String> loadImageList;
 
     @ApiModelProperty(value = "装货时间")
-    @NotBlank(message = "装货时间不能为空")
     private String loadTime;
 }

performance-api/src/main/java/com/clx/performance/param/app/OrderChildUnloadParam.java

@@ -5,10 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -32,7 +30,6 @@ public class OrderChildUnloadParam extends PositionParam {
     private List<String> unloadImageList;
 
     @ApiModelProperty(value = "交货时间")
-    @NotBlank(message = "交货时间不能为空")
     private String unloadTime;
 
 }

performance-api/src/main/java/com/clx/performance/vo/app/OcrRecognitionResultVO.java

@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.math.BigDecimal;
+
 /**
  * @author yangqifa
  */
@@ -15,7 +17,7 @@ import lombok.ToString;
 @NoArgsConstructor
 public class OcrRecognitionResultVO {
     @ApiModelProperty(value = "毛重", example = "48.36")
-    private Double grossWeight;
+    private BigDecimal grossWeight;
     @ApiModelProperty(value = "皮重", example = "16.32")
-    private Double tareWeight;
+    private BigDecimal tareWeight;
 }

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditDetailVO.java

@@ -72,14 +72,14 @@ public class OrderChildPoundAuditDetailVO {
     private String receiveAddress;
 
     @ApiModelProperty(value = "装车识别毛重参考")
-    private Double loadGrossWeight;
+    private BigDecimal loadGrossWeight;
 
     @ApiModelProperty(value = "装车识别皮重参考")
-    private Double loadTareWeight;
+    private BigDecimal loadTareWeight;
 
     @ApiModelProperty(value = "卸车识别毛重参考")
-    private Double unloadGrossWeight;
+    private BigDecimal unloadGrossWeight;
 
     @ApiModelProperty(value = "卸车识别皮重参考")
-    private Double unloadTareWeight;
+    private BigDecimal unloadTareWeight;
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/config/TencentCloudApiOcrConfig.java

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author yangqifa
+ */
+@Configuration
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "tencentcloudapi.credential")
+public class TencentCloudApiOcrConfig {
+
+    private String secretId;
+
+    private String secretKey;
+}

performance-web/src/main/java/com/clx/performance/dao/OcrRecognitionDao.java

@@ -2,10 +2,13 @@ package com.clx.performance.dao;
 
 import com.clx.performance.mapper.OcrRecognitionMapper;
 import com.clx.performance.model.OcrRecognition;
+import com.clx.performance.param.app.OcrRecognitionParam;
 import com.msl.common.dao.BaseDao;
 
 /**
  * @author yangqifa
  */
 public interface OcrRecognitionDao extends BaseDao<OcrRecognitionMapper, OcrRecognition, Integer> {
+
+    boolean exists(OcrRecognitionParam param);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OcrRecognitionDaoImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.clx.performance.dao.OcrRecognitionDao;
 import com.clx.performance.mapper.OcrRecognitionMapper;
 import com.clx.performance.model.OcrRecognition;
+import com.clx.performance.param.app.OcrRecognitionParam;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -12,4 +13,11 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OcrRecognitionDaoImpl extends BaseDaoImpl<OcrRecognitionMapper, OcrRecognition, Integer> implements OcrRecognitionDao {
+
+    @Override
+    public boolean exists(OcrRecognitionParam param) {
+        return baseMapper.exists(lQrWrapper()
+                .eq(OcrRecognition::getChildNo, param.getChildNo())
+                .eq(OcrRecognition::getImageType, param.getImageType()));
+    }
 }

performance-web/src/main/java/com/clx/performance/model/OcrRecognition.java

@@ -6,6 +6,7 @@ import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Data;
@@ -45,13 +46,13 @@ public class OcrRecognition implements HasKey<Integer> {
      * 毛重
      */
     @ApiModelProperty(value = "毛重")
-    private Double grossWeight;
+    private BigDecimal grossWeight;
 
     /**
      * 皮重
      */
     @ApiModelProperty(value = "皮重")
-    private Double tareWeight;
+    private BigDecimal tareWeight;
 
     /**
      * OCR识别的原始结果