Merge branch 'v20.6_carrier_station_pound_20240802' into test

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

+package com.clx.performance.param.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildWeighPictureParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+
+}

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

+package com.clx.performance.vo.app;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @author liruixin
+ * Date 2024-08-02
+ * Time 15:38
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class OrderChildWeighPictureVo {
+
+    private Integer id;
+
+    @ApiModelProperty("运单编号")
+    private String childNo;
+
+    @ApiModelProperty("图片类型 1-装车 2-卸车")
+    private Integer type;
+
+    @ApiModelProperty("原始磅单图")
+    private String originalImg;
+
+    @ApiModelProperty("不带签章磅单图")
+    private String noSignImg;
+
+    @ApiModelProperty("带签章磅单图")
+    private String signImg;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String modifiedTime;
+
+}

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

+package com.clx.performance.vo.app;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author liruixin
+ * Date 2024-08-02
+ * Time 15:38
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PictureVo {
+
+
+    @ApiModelProperty("装车图片")
+    private List<String> loadImages;
+
+    @ApiModelProperty("卸车图片")
+    private List<String> unloadImages;
+
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverOrderChildWeighPictureController.java

+package com.clx.performance.controller.app;
+
+import com.clx.performance.param.app.OrderChildWeighPictureParam;
+import com.clx.performance.service.OrderChildWeighPictureService;
+import com.clx.performance.vo.app.PictureVo;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/orderChildWeighPicture")
+@Validated
+@Api(tags = "APP-运单电子磅单")
+public class AppDriverOrderChildWeighPictureController {
+
+    @Autowired
+    private OrderChildWeighPictureService pictureService;
+
+
+
+    @ApiOperation(value = "查询电子磅单", notes = "<br>By:李瑞新")
+    @PostMapping("/getWeighPictures")
+    public Result<PictureVo> getWeighPictures(@RequestBody @Validated OrderChildWeighPictureParam param) {
+
+        return Result.ok(pictureService.getWeighPictures(param));
+    }
+
+}

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

@@ -13,6 +13,7 @@ import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
 import com.clx.performance.vo.pc.child.UpdateCarrierBatchCancelVO;
 import com.msl.common.base.PageParam;
+import com.smart.weight.dto.WeighingSignatureDto;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 
 import java.math.BigDecimal;
@@ -117,4 +118,6 @@ public interface OrderChildService {
     void orderChildMessageNotice();
 
     NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param);
+
+    List<WeighingSignatureDto> getWeighingSignature(String childNo);
 }

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

 package com.clx.performance.service;
 
+import com.clx.performance.param.app.OrderChildWeighPictureParam;
+import com.clx.performance.vo.app.PictureVo;
+
 /**
  * @author liruixin
  * Date 2024-08-02
  * Time 15:38
  */
 public interface OrderChildWeighPictureService {
+
+     PictureVo getWeighPictures(OrderChildWeighPictureParam param);
 }

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

@@ -74,6 +74,7 @@ import com.clx.user.feign.DocumentFeign;
 import com.clx.user.feign.UserClxFeign;
 import com.clx.user.param.feign.BatchUpdateDriverAndTruckParam;
 import com.clx.user.feign.UserClxFeign;
+import com.clx.user.param.feign.BatchUpdateDriverAndTruckParam;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.clx.user.vo.pc.auth.AuthVo;
@@ -2187,7 +2188,9 @@ public class OrderChildServiceImpl implements OrderChildService {
                 item -> item.getImage()).collect(Collectors.toList()));
 
         if(CollectionUtils.isEmpty(result.getUnloadImageList())){
-            result.setUnloadImageList(getWeighingSignature(childNo));//获取电子磅单图片
+            result.setUnloadImageList(getWeighingSignature(childNo).stream().filter(
+                    item -> Objects.equals(item.getType(), 2)).map(
+                    item -> item.getOriginalImg()).collect(Collectors.toList()));//获取电子磅单图片
         }
 
         result.setArriveSendTime(orderChild.getArriveSendTime()==null?null:convertLocalDateTimeToDefaultString(orderChild.getArriveSendTime()));
@@ -3489,7 +3492,9 @@ public class OrderChildServiceImpl implements OrderChildService {
             return null;
         }
 
-        List<String> images = getWeighingSignature(param.getChildNo());//获取电子磅单图片
+        List<String> images = getWeighingSignature(param.getChildNo()).stream().filter(
+                item -> Objects.equals(item.getType(), 2)).map(
+                item -> item.getOriginalImg()).collect(Collectors.toList());//获取电子磅单图片
         if(CollectionUtils.isNotEmpty(images)){
             return null;
         }
@@ -3765,7 +3770,7 @@ public class OrderChildServiceImpl implements OrderChildService {
      * @param childNo
      * @return
      */
-    private List<String> getWeighingSignature(String childNo){
+    public List<WeighingSignatureDto> getWeighingSignature(String childNo){
         App app = loadAppConfig.getSmartWeightApp();//对接场站配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
@@ -3782,9 +3787,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         //数据处理
         if(Objects.equals(weighSignature.getCode(),0)){
             List<WeighingSignatureDto> weighSignatures = weighSignature.getData();
-            return weighSignatures.stream().filter(
-                    item -> Objects.equals(item.getType(), 2)).map(
-                    item -> item.getOriginalImg()).collect(Collectors.toList());
+            return weighSignatures;
 
         }
         return new ArrayList<>();

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

 package com.clx.performance.service.impl;
 
+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.smart.weight.dto.WeighingSignatureDto;
+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;
+
 /**
  * @author liruixin
  * Date 2024-08-02
@@ -10,4 +19,21 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class OrderChildWeighPictureServiceImpl  implements OrderChildWeighPictureService {
+
+    @Autowired
+    private OrderChildService orderChildService;
+
+    @Override
+    public PictureVo getWeighPictures(OrderChildWeighPictureParam param) {
+        //电子磅单图片
+        List<WeighingSignatureDto> images = orderChildService.getWeighingSignature(param.getChildNo());
+        PictureVo vo = new PictureVo();
+        vo.setLoadImages(images.stream().filter(
+                item -> Objects.equals(item.getType(), 1)).map(
+                item -> item.getOriginalImg()).collect(Collectors.toList()));
+        vo.setUnloadImages(images.stream().filter(
+                item -> Objects.equals(item.getType(), 2)).map(
+                item -> item.getOriginalImg()).collect(Collectors.toList()));
+        return vo;
+    }
 }