Merge branch 'v21.1_jianzhuang_20240807' of…

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

@@ -15,6 +15,10 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class NeedAlertSuperviseInfoParam {
 
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
     @ApiModelProperty(value = "订单编号", example = "100000000")
     @NotBlank(message = "订单编号不能为空")
     private String orderNo;

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

@@ -203,8 +203,7 @@ public class AppDriverOrderChildController {
     @ApiOperation(value = "是否需要弹出监装信息", notes = "<br>By:姜武杰")
     @PostMapping("/needAlertSuperviseInfo")
     public Result<NeedAlertSuperviseInfoResultVO> needAlertSuperviseInfo(@RequestBody @Validated NeedAlertSuperviseInfoParam param) {
-        // TODO 待实现
-        return Result.ok();
+        return Result.ok(orderChildService.needAlertSuperviseInfo(param));
     }
 
 }

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

@@ -84,7 +84,9 @@ import com.msl.common.utils.gps.GpsUtil;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import com.purchase.manage.action.SupplyChainSupervisionLoadAction;
+import com.purchase.manage.action.SupplyChainSupervisionLoadTruckAction;
 import com.purchase.manage.dto.SupervisionLoadInfoDto;
+import com.purchase.manage.dto.SupervisionLoadTruckInfoDto;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.ocr.v20181119.OcrClient;
@@ -3408,6 +3410,8 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     @Override
     public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
+        //返回对象
+        NeedAlertSuperviseInfoResultVO result = new NeedAlertSuperviseInfoResultVO();
         App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
         //组装配置信息
         RequestConfig config = new RequestConfig()
@@ -3419,8 +3423,43 @@ public class OrderChildServiceImpl implements OrderChildService {
         SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
         action.setOrderNo(param.getOrderNo());
         action.setType(param.getType());
+
         log.info("请求获取监装监卸信息参数,{}",action);
-        OpenClient.doAction(config, action);
-        return null;
+        Result<SupervisionLoadInfoDto> supervisionLoadInfoDto = OpenClient.doAction(config, action);
+        if(!supervisionLoadInfoDto.succeed()){//接口调用失败
+            result.setNeedAlert(0);
+            return result;
+            //throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息失败");
+        }
+        SupervisionLoadInfoDto supervisionLoadInfo = supervisionLoadInfoDto.getData();//监装信息
+        if(Objects.nonNull(supervisionLoadInfo)){//有监装信息
+            //通过运单号查询监装监卸子任务状态
+            SupplyChainSupervisionLoadTruckAction truckAction = new SupplyChainSupervisionLoadTruckAction();
+            truckAction.setChildNo(param.getChildNo());
+            truckAction.setType(param.getType());
+            log.info("请求获取监装监卸子任务信息参数,{}",truckAction);
+
+            Result<SupervisionLoadTruckInfoDto> supervisionLoadTruckInfoDto = OpenClient.doAction(config, truckAction);
+            if(!supervisionLoadTruckInfoDto.succeed()){//接口调用失败
+                result.setNeedAlert(0);
+                return result;
+                //throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "获取监装监卸信息子任务失败");
+            }
+
+            SupervisionLoadTruckInfoDto supervisionLoadTruckInfo = supervisionLoadTruckInfoDto.getData();
+            if(Objects.nonNull(supervisionLoadTruckInfo)){
+                if(supervisionLoadTruckInfo.getLoadStatus()){
+                    result.setNeedAlert(1);
+                    result.setLocation(supervisionLoadInfo.getTaskAddress());
+                    result.setMobile(supervisionLoadInfo.getTaskMobile());
+                    result.setSupervisor(supervisionLoadInfo.getTaskContracts());
+                    return result;
+                }
+            }
+
+        }
+
+        result.setNeedAlert(0);
+        return result;
     }
 }