电子过磅单图片

performance-web/src/main/java/com/clx/performance/job/WeighingOderPictureJob.java

 package com.clx.performance.job;
 
-import com.clx.performance.config.LoadAppConfig;
-import com.clx.performance.config.PerformanceSmartCompanyNoConfig;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildWeighPictureDao;
-import com.clx.performance.enums.AppEnum;
 import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.model.App;
+import com.clx.performance.enums.SaleBuyEnum;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildWeighPicture;
+import com.clx.performance.service.OrderChildService;
 import com.clx.performance.struct.OrderChildWeighPictureStruct;
 import com.msl.common.job.JobLog;
-import com.msl.common.open.OpenClient;
-import com.msl.common.open.RequestConfig;
+import com.smart.business.sdk.request.dto.WeighingSignatureDto;
+import com.smart.business.sdk.request.dto.WeightChildSignatureDto;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -23,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -41,10 +38,7 @@ public class WeighingOderPictureJob{
     private OrderChildWeighPictureDao pictureDao;
 
     @Autowired
-    private PerformanceSmartCompanyNoConfig companyNoConfig;
-
-    @Autowired
-    private LoadAppConfig loadAppConfig;
+    private OrderChildService orderChildService;
 
 
     /**
@@ -75,34 +69,21 @@ public class WeighingOderPictureJob{
 
         //查询运单下的电子磅单数据
         if(CollectionUtils.isNotEmpty(orderChilds)){
-            App app = loadAppConfig.getApp(AppEnum.UniqueIdentifier.SMART_WEIGHT.getCode());//对接场站配置信息
-            //组装配置信息
-            RequestConfig config = new RequestConfig()
-                    .setAppId(app.getAppNo())
-                    .setAppKey(app.getAppKey())
-                    .setGatewayUrl(app.getCallback());
 
             //集合对象
             List<OrderChildWeighPicture> pictures = new ArrayList<>();
             for(OrderChild orderChild:orderChilds){
-                //通过运单号码查询电子磅单图片
-                WeighingSignatureAction weightAction = new WeighingSignatureAction();
-                weightAction.setChildNo(orderChild.getChildNo());
-                weightAction.setCustomerRelationNo(String.valueOf(companyNoConfig.getCompanyNo()));
-                log.info("job请求电子磅单参数,{}",weightAction);
-                Result<List<WeighingSignatureDto>> weighSignature = OpenClient.doAction(config, weightAction);
-                log.info("job请求电子磅单返回结果,{}",weighSignature);
+                //通过运单号查询电子磅单图片
+                WeightChildSignatureDto weighingSignature = orderChildService.getWeighingSignature(orderChild.getChildNo(), SaleBuyEnum.Type.BUY.getCode());
                 //数据处理
-                if(!Objects.equals(weighSignature.getCode(),0)){
+                if(CollectionUtils.isEmpty(weighingSignature.getWeighingSignatureList())){
                     continue;
                 }
-                List<WeighingSignatureDto> weighSignatures = weighSignature.getData();
-                if (CollectionUtils.isNotEmpty(weighSignatures)) {
-                    for(WeighingSignatureDto weighingSignatureDto:weighSignatures){
-                        OrderChildWeighPicture picture = pictureStruct.convert(weighingSignatureDto);
-                        picture.setChildNo(orderChild.getChildNo());//对象转换
-                        pictures.add(picture);
-                    }
+                List<WeighingSignatureDto> weighingSignatureList = weighingSignature.getWeighingSignatureList();
+                for(WeighingSignatureDto weighingSignatureDto:weighingSignatureList){
+                    OrderChildWeighPicture picture = pictureStruct.convert(weighingSignatureDto);
+                    picture.setChildNo(orderChild.getChildNo());//对象转换
+                    pictures.add(picture);
                 }
 
             }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -121,5 +121,5 @@ public interface OrderChildService {
     UpdateCarrierBatchCancelVO updateCarrierBatchCancel(OrderChildCarrierBatchCancelParam param);
 
 
-    WeightChildSignatureDto getWeighingSignature(String childNo);
+    WeightChildSignatureDto getWeighingSignature(String childNo,Integer type);
 }

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

@@ -93,10 +93,8 @@ import com.purchase.manage.action.SupplyChainSupervisionLoadTruckAction;
 import com.purchase.manage.dto.SupervisionLoadInfoDto;
 import com.purchase.manage.dto.SupervisionLoadTruckInfoDto;
 import com.scm.lms.manage.action.LmsWeighingSignatureAction;
-import com.scm.lms.manage.dto.LmsWeighingSignatureDTO;
+import com.smart.business.sdk.request.dto.WeighingSignatureDto;
 import com.smart.business.sdk.request.dto.WeightChildSignatureDto;
-import com.smart.weight.action.WeighingSignatureAction;
-import com.smart.weight.dto.WeighingSignatureDto;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.ocr.v20181119.OcrClient;
@@ -3500,11 +3498,16 @@ public class OrderChildServiceImpl implements OrderChildService {
             return null;
         }
 
-        List<String> images = getWeighingSignature(param.getChildNo()).stream().filter(
-                item -> Objects.equals(item.getType(), 2)).map(
-                item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg()).collect(Collectors.toList());//获取电子磅单图片
-        if(CollectionUtils.isNotEmpty(images)){
-            return null;
+        WeightChildSignatureDto weighingSignature = getWeighingSignature(param.getChildNo(),SaleBuyEnum.Type.BUY.getCode());//获取电子磅单图片
+        List<WeighingSignatureDto> weighingSignatureList = weighingSignature.getWeighingSignatureList();//图片集合
+        if(CollectionUtils.isNotEmpty(weighingSignatureList)){
+            List<String> images =  weighingSignatureList.stream().filter(
+                            item -> Objects.equals(item.getType(), InputOutputEnum.Type.OUTPUT.getCode())).map(
+                            item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg())
+                    .collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(images)){
+                return null;
+            }
         }
 
         try{

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

 package com.clx.performance.service.impl;
 
+import com.clx.performance.enums.InputOutputEnum;
+import com.clx.performance.enums.SaleBuyEnum;
 import com.clx.performance.param.app.OrderChildWeighPictureParam;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderChildWeighPictureService;
 import com.clx.performance.vo.app.PictureVo;
-import com.scm.lms.manage.dto.LmsWeighingSignatureDTO;
-import com.smart.weight.dto.WeighingSignatureDto;
+import com.smart.business.sdk.request.dto.WeightChildSignatureDto;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -28,14 +29,15 @@ public class OrderChildWeighPictureServiceImpl  implements OrderChildWeighPictur
     @Override
     public PictureVo getWeighPictures(OrderChildWeighPictureParam param) {
         //电子磅单图片
-        List<LmsWeighingSignatureDTO> images = orderChildService.getWeighingSignature(param.getChildNo());
+        WeightChildSignatureDto unloadImages = orderChildService.getWeighingSignature(param.getChildNo(), SaleBuyEnum.Type.BUY.getCode());
         PictureVo vo = new PictureVo();
-        vo.setLoadImages(images.stream().filter(
-                item -> Objects.equals(item.getType(), 1)).map(
-                item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg()).collect(Collectors.toList()));
-        vo.setUnloadImages(images.stream().filter(
-                item -> Objects.equals(item.getType(), 2)).map(
-                item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg()).collect(Collectors.toList()));
+
+        if (CollectionUtils.isNotEmpty(unloadImages.getWeighingSignatureList())){
+            vo.setUnloadImages(unloadImages.getWeighingSignatureList().stream().filter(
+                    item -> Objects.equals(item.getType(), InputOutputEnum.Type.OUTPUT.getCode())).map(
+                    item -> StringUtils.isNotBlank(item.getSignImg())? item.getSignImg():item.getOriginalImg()).collect(Collectors.toList()));
+        }
+
         return vo;
     }
 }