Merge branch 'v20.6_carrier_station_pound_20240802' into test

performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java

 package com.clx.performance.feign;
 
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
+import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressLogAction;
 import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;

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

@@ -198,6 +198,7 @@ public class OrderGoodsVO {
         return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
     }
 
+
     @ApiModelProperty("当前货单总吨数是否超过总拉运量  1:超过  ")
     private Integer overOrderWeight;
 }
\ No newline at end of file

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

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
 @Component
 public class LoadAppConfig {
 
-
     private App purchaseManageApp;
 
     @Autowired

performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java

@@ -57,4 +57,6 @@ public class RedisConstants {
      */
     public static final String NOTICE_MESSAGE_LIMIT_UNSUPERVISED = "clx-performance:notice_message_limit_unsupervised:";
 
+
+
 }

performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java

 package com.clx.performance.controller.feign;
 
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
+import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
 import com.clx.open.sdk.request.action.GetOwnerAccountInfoAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressLogAction;
@@ -32,6 +33,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
 import java.util.List;
 
 import static com.clx.performance.enums.PerformanceProgressEnum.LogType.PERFORMANCE_ABNORMAL_REASON;
@@ -62,6 +64,8 @@ public class PerformanceSdkFeignController {
 
     private final OrderService orderService;
 
+    private final PerformanceProgressService performanceProgressService;
+
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")

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

@@ -5,11 +5,7 @@ import com.clx.performance.mapper.AppMapper;
 import com.clx.performance.model.App;
 import com.msl.common.dao.BaseDao;
 
-/**
- * @author Min
- * Date 2024-06-14
- * Time 11:51
- */
+
 public interface AppDao extends BaseDao<AppMapper, App, Integer> {
 
 }

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

@@ -211,6 +211,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> listChidNosByStatus(List<Integer> status);
 
 
+
     List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList);
 
     void batchUpdateCancel(List<OrderChild> canCancelOrderChildList);

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

@@ -698,6 +698,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+
     @Override
     public List<OrderGoodsNotCancelChildDTO> countValidByOrderGoodsNoList(List<String> orderGoodsList) {
         return baseMapper.countValidByOrderGoodsNoList(orderGoodsList);

performance-web/src/main/java/com/clx/performance/mapper/AppMapper.java

@@ -4,10 +4,6 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.clx.performance.model.App;
 
-/**
- * @author Min
- * Date 2024-06-14
- * Time 11:51
- */
+
 public interface AppMapper extends BaseMapper<App> {
 }

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

@@ -13,11 +13,7 @@ import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
 
-/**
- * @author Min
- * Date 2024-06-14
- * Time 11:51
- */
+
 @Getter
 @Setter
 @Accessors(chain = true)
@@ -53,7 +49,7 @@ public class App  implements HasKey<Integer> {
 
     @TableField("create_time")
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private LocalDateTime createTime;                      //
 
     @TableField("modified_time")
     @ApiModelProperty("修改时间")

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

@@ -72,6 +72,7 @@ import com.clx.user.enums.idcard.IdCardEnum;
 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.vo.feign.DriverTruckInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.clx.user.vo.pc.auth.AuthVo;
@@ -259,6 +260,12 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private DocumentFeign documentFeign;
     @Autowired
+    private OrderChildWeighPictureDao pictureDao;
+
+
+    @Autowired
+    private OrderWeightService orderWeightService;
+    @Autowired
     private UserClxFeign userClxFeign;
     @Autowired
     private OrderWeightService orderWeightService;
@@ -3480,6 +3487,14 @@ public class OrderChildServiceImpl implements OrderChildService {
             return null;
         }
 
+        List<OrderChildWeighPicture> pictures = pictureDao.getImages(param.getChildNo());
+        List<String> image = pictures.stream().filter(
+                item -> Objects.equals(item.getType(), 2)).map(
+                item -> item.getOriginalImg()).collect(Collectors.toList());
+        if(CollectionUtils.isNotEmpty(image)){
+            return null;
+        }
+
         try{
             OcrRecognitionResultVO vo = new OcrRecognitionResultVO();
             Credential cred = new Credential(tencentCloudApiOcrConfig.getSecretId(), tencentCloudApiOcrConfig.getSecretKey());
@@ -3561,6 +3576,24 @@ public class OrderChildServiceImpl implements OrderChildService {
         return charts;
     }
 
+    @Override
+    public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
+        //查询运单信息
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(DATA_NOT_FIND);
+        SuperviseInfo superviseInfo = getSuperviseInfoWithSubStatus(orderChild.getOrderNo(), orderChild.getChildNo(), orderChild.getTruckNo());
+        //返回对象
+        NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
+        if (superviseInfo != null) {
+            result.setNeedAlert(OrderChildEnum.NeedAlertEnum.FAIL.getCode());
+            result.setLocation(superviseInfo.getTaskAddress());
+            result.setMobile(superviseInfo.getSuperviseMobile());
+            result.setSupervisor(superviseInfo.getSuperviseContacts());
+            return result;
+        }
+        result.setNeedAlert(OrderChildEnum.NeedAlertEnum.OK.getCode());
+        return result;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public UpdateCarrierBatchCancelVO updateCarrierBatchCancel(OrderChildCarrierBatchCancelParam param) {

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

@@ -127,7 +127,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
 
     @Autowired
     private OrderGoodsFleetOpenTruckDao orderGoodsFleetOpenTruckDao;
-    
+
     @Autowired
     OrderWeightService orderWeightService;