磅单OCR识别需求

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

@@ -156,7 +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识别的原始结果

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -15,6 +15,7 @@ import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderChildLoanComponent;
+import com.clx.performance.config.TencentCloudApiOcrConfig;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.*;
@@ -58,8 +59,8 @@ import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
-import com.clx.performance.vo.pc.carrier.settle.CarrierPagePlatformServiceFeeConfigVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
+import com.clx.user.feign.DocumentFeign;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.base.Optional;
@@ -81,18 +82,20 @@ import com.tencentcloudapi.ocr.v20181119.models.SmartStructuralOCRV2Request;
 import com.tencentcloudapi.ocr.v20181119.models.SmartStructuralOCRV2Response;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
@@ -102,6 +105,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static com.clx.performance.enums.PerformanceResultEnum.*;
 import static com.msl.common.utils.LocalDateTimeUtils.convertLocalDateTimeToDefaultString;
 import static com.msl.common.utils.LocalDateTimeUtils.covertStringToDefaultLocalDateTime;
 
@@ -114,6 +118,9 @@ import static com.msl.common.utils.LocalDateTimeUtils.covertStringToDefaultLocal
 @Slf4j
 @Service
 public class OrderChildServiceImpl implements OrderChildService {
+
+    private String domain = "http://clx-dev.oss-cn-beijing.aliyuncs.com";
+
     @Autowired
     private AmqpTemplate rabbitTemplate;
     @Autowired
@@ -200,7 +207,6 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     SettlementOwnerDetailDao settlementOwnerDetailDao;
 
-
     @Autowired
     private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
 
@@ -220,7 +226,22 @@ public class OrderChildServiceImpl implements OrderChildService {
     private QuotationService quotationService;
     @Autowired
     private OcrRecognitionDao ocrRecognitionDao;
+    @Autowired
+    private TencentCloudApiOcrConfig tencentCloudApiOcrConfig;
+    @Autowired
+    private Environment environment;
+    @Autowired
+    private DocumentFeign documentFeign;
 
+    @PostConstruct
+    public void init(){
+        String[] activeProfiles = environment.getActiveProfiles();
+        if(!StringUtils.equals(activeProfiles[0],"dev")){
+            log.info("开始获取文件上传domain地址================");
+            domain = documentFeign.getHost().getData();
+            log.info("获取文件上传domain地址结束，地址：{}",domain);
+        }
+    }
 
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
@@ -816,6 +837,20 @@ public class OrderChildServiceImpl implements OrderChildService {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_LOAD_WEIGHT_ERROR);
         }
 
+        //装货时间不可早于到达货源地时间
+        LocalDateTime loadTime = StringUtils.isBlank(param.getLoadTime()) ? null : covertStringToDefaultLocalDateTime(param.getLoadTime());
+        if (loadTime!=null && loadTime.isBefore(orderChild.getArriveSendTime())) {
+            throw new ServiceSystemException(LOAD_TIME_BEFORE_ARRIVE_SEND_TIME);
+        }
+        //装货时间不可晚于当前时间
+        if (loadTime!=null && loadTime.isAfter(LocalDateTime.now())) {
+            throw new ServiceSystemException(LOAD_TIME_AFTER_NOW);
+        }
+        //装货时间不可晚于首次提交时间
+        if (loadTime!=null && orderChild.getFirstLoadTime()!=null && loadTime.isAfter(orderChild.getFirstLoadTime())) {
+            throw new ServiceSystemException(LOAD_TIME_AFTER_FIRST_LOAD_TIME);
+        }
+
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -937,11 +972,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.LOAD.getCode());
-        orderChild.setFirstLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setFirstLoadTime(orderChild.getLoadTime());
         orderChildDao.updateLoad(orderChild);
 
         orderChildImageDao.batchSaveEntity(imageList);
@@ -975,7 +1010,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setLoadRough(param.getLoadRough());
         orderChild.setLoadTare(param.getLoadTare());
         orderChild.setLoadNet(loadNet);
-        orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         //更新货单吨数
@@ -1013,6 +1048,19 @@ public class OrderChildServiceImpl implements OrderChildService {
 //            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
 //        }
 
+        //交货时间不可早于到达目的地时间
+        LocalDateTime unloadTime = StringUtils.isBlank(param.getUnloadTime()) ? null : covertStringToDefaultLocalDateTime(param.getUnloadTime());
+        if (unloadTime!=null && unloadTime.isBefore(orderChild.getArriveReceiveTime())) {
+            throw new ServiceSystemException(UNLOAD_TIME_BEFORE_ARRIVE_RECEIVE_TIME);
+        }
+        //交货时间不可晚于当前时间
+        if (unloadTime!=null && unloadTime.isAfter(LocalDateTime.now())) {
+            throw new ServiceSystemException(UNLOAD_TIME_AFTER_NOW);
+        }
+        //交货时间不可晚于首次提交时间
+        if (unloadTime!=null && orderChild.getFirstUnloadTime()!=null && unloadTime.isAfter(orderChild.getFirstUnloadTime())) {
+            throw new ServiceSystemException(UNLOAD_TIME_AFTER_FIRST_UNLOAD_TIME);
+        }
 
         if (orderChild.getUnloadTime() == null &&
                 Objects.equals(orderChild.getStatus(), OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())) {
@@ -1108,12 +1156,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setStatus(OrderChildEnum.Status.UNLOAD.getCode());
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
-        orderChild.setFirstUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setFirstUnloadTime(orderChild.getUnloadTime());
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);
@@ -1170,7 +1218,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setUnloadRough(param.getUnloadRough());
         orderChild.setUnloadTare(param.getUnloadTare());
         orderChild.setUnloadNet(loadNet);
-        orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
         orderChild.setFreight(orderChildFreightCalc(orderChild));
@@ -1243,6 +1291,25 @@ public class OrderChildServiceImpl implements OrderChildService {
 //            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_UNLOAD_WEIGHT_ERROR);
 //        }
 
+        //装货时间不可早于到达货源地时间
+        LocalDateTime loadTime = StringUtils.isBlank(param.getLoadTime()) ? null : covertStringToDefaultLocalDateTime(param.getLoadTime());
+        if (loadTime!=null && loadTime.isBefore(orderChild.getArriveSendTime())) {
+            throw new ServiceSystemException(LOAD_TIME_BEFORE_ARRIVE_SEND_TIME);
+        }
+        //装货时间不可晚于首次提交时间
+        if (loadTime!=null && orderChild.getFirstLoadTime()!=null && loadTime.isAfter(orderChild.getFirstLoadTime())) {
+            throw new ServiceSystemException(LOAD_TIME_AFTER_FIRST_LOAD_TIME);
+        }
+        //交货时间不可早于到达目的地时间
+        LocalDateTime unloadTime = StringUtils.isBlank(param.getUnloadTime()) ? null : covertStringToDefaultLocalDateTime(param.getUnloadTime());
+        if (unloadTime!=null && unloadTime.isBefore(orderChild.getArriveReceiveTime())) {
+            throw new ServiceSystemException(UNLOAD_TIME_BEFORE_ARRIVE_RECEIVE_TIME);
+        }
+        //交货时间不可晚于首次提交时间
+        if (unloadTime!=null && orderChild.getFirstUnloadTime()!=null && unloadTime.isAfter(orderChild.getFirstUnloadTime())) {
+            throw new ServiceSystemException(UNLOAD_TIME_AFTER_FIRST_UNLOAD_TIME);
+        }
+
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                 PerformanceResultEnum.ORDER_INVALID);
 
@@ -1273,8 +1340,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setWeight(orderChildWeightCalc(orderChild));
         orderChild.setFreight(orderChildFreightCalc(orderChild));
         orderChild.setPoundStatus(OrderChildPoundAuditEnum.Status.AUDIT.getCode());
-        orderChild.setLoadTime(covertStringToDefaultLocalDateTime(param.getLoadTime()));
-        orderChild.setUnloadTime(covertStringToDefaultLocalDateTime(param.getUnloadTime()));
+        orderChild.setLoadTime(StringUtils.isBlank(param.getLoadTime())?null:covertStringToDefaultLocalDateTime(param.getLoadTime()));
+        orderChild.setUnloadTime(StringUtils.isBlank(param.getUnloadTime())?null:covertStringToDefaultLocalDateTime(param.getUnloadTime()));
 
         OrderChildPoundAudit audit = new OrderChildPoundAudit();
         audit.setChildNo(childNo);
@@ -2790,13 +2857,18 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public OcrRecognitionResultVO ocrRecognition(OcrRecognitionParam param) {
-        OcrRecognitionResultVO vo = new OcrRecognitionResultVO();
+        //校验，同一运单同一图片类型只能识别一次
+        if (ocrRecognitionDao.exists(param)) {
+            throw new ServiceSystemException(OCR_RECOGNITION_REPEAT);
+        }
+
         try{
-            Credential cred = new Credential(secretId, secretKey);
+            OcrRecognitionResultVO vo = new OcrRecognitionResultVO();
+            Credential cred = new Credential(tencentCloudApiOcrConfig.getSecretId(), tencentCloudApiOcrConfig.getSecretKey());
             OcrClient client = new OcrClient(cred, "ap-beijing");
             String[] itemNames = {"毛重", "皮重"};
             SmartStructuralOCRV2Request req = new SmartStructuralOCRV2Request();
-            req.setImageUrl(ossDomain+param.getImageUrl());
+            req.setImageUrl(domain+param.getImageUrl());
             req.setItemNames(itemNames);
             SmartStructuralOCRV2Response resp = client.SmartStructuralOCRV2(req);
             Map<String,String> originalResultMap = new HashMap<>();
@@ -2807,9 +2879,9 @@ public class OrderChildServiceImpl implements OrderChildService {
                 originalResultMap.put(autoName,autoContent);
                 if (NumberUtils.isCreatable(autoContent)) {
                     if ("毛重".equals(autoName)) {
-                        vo.setGrossWeight(Double.valueOf(autoContent));
+                        vo.setGrossWeight(new BigDecimal(autoContent));
                     }else if ("皮重".equals(autoName)) {
-                        vo.setTareWeight(Double.valueOf(autoContent));
+                        vo.setTareWeight(new BigDecimal(autoContent));
                     }
                 }
             }
@@ -2823,9 +2895,10 @@ public class OrderChildServiceImpl implements OrderChildService {
             ocrRecognition.setTareWeight(vo.getTareWeight());
             ocrRecognition.setOriginalResult(JSONUtil.toJsonStr(originalResultMap));
             ocrRecognitionDao.saveEntity(ocrRecognition);
+            return vo;
         } catch (TencentCloudSDKException e) {
             log.error(e.getMessage(),e);
+            throw new ServiceSystemException(OCR_RECOGNITION_ERROR);
         }
-        return vo;
     }
 }