merge to release

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

@@ -15,12 +15,13 @@ import javax.validation.constraints.NotBlank;
 @NoArgsConstructor
 public class NeedAlertSuperviseInfoParam {
 
-    @ApiModelProperty(value = "货单编号", example = "100000000")
-    @NotBlank(message = "货单编号不能为空")
-    private String orderGoodsNo;
+    @ApiModelProperty(value = "订单编号", example = "100000000")
+    @NotBlank(message = "订单编号不能为空")
+    private String orderNo;
 
-    @ApiModelProperty(value = "运单编号", example = "100000000")
-    @NotBlank(message = "运单编号不能为空")
-    private String childNo;
+
+    @ApiModelProperty(value = "类型 1-监装 2-监卸", example = "1")
+    @NotBlank(message = "类型不能为空")
+    private Integer type;
 
 }

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

@@ -15,18 +15,18 @@ import org.springframework.stereotype.Component;
 public class LoadAppConfig {
 
 
-    private App app;
+    private App purchaseManageApp;
 
     @Autowired
     private AppDao appDao;
 
 
-    public App getApp() {
-        if (app == null) {
-            app = appDao.getOneByField(App::getUniqueIdentifier, AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode()).orElseThrow(
+    public App getPurchaseManageApp() {
+        if (purchaseManageApp == null) {
+            purchaseManageApp = appDao.getOneByField(App::getUniqueIdentifier, AppEnum.UniqueIdentifier.PURCHASE_MANAGE.getCode()).orElseThrow(
                     PerformanceResultEnum.DATA_NOT_FIND);;
         }
-        return app;
+        return purchaseManageApp;
     }
 
 }

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

@@ -8,7 +8,6 @@ import com.clx.performance.param.app.*;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.param.feign.CancelOrderGoodsParam;
 import com.clx.performance.param.pc.*;
-import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.clx.performance.vo.pc.*;
@@ -113,4 +112,7 @@ public interface OrderChildService {
     OrderChildLoadRangeCheckResultVO loadRangeCheck(OrderChildLoadRangeCheckParam param);
 
     void orderChildMessageNotice();
+
+
+    NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param);
 }

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

@@ -18,6 +18,7 @@ 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.ClxMessageConfig;
+import com.clx.performance.config.LoadAppConfig;
 import com.clx.performance.config.TencentCloudApiOcrConfig;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RedissonConstants;
@@ -74,12 +75,16 @@ import com.msl.common.base.Optional;
 import com.msl.common.base.PageParam;
 import com.msl.common.enums.ResultCodeEnum;
 import com.msl.common.exception.ServiceSystemException;
+import com.msl.common.open.OpenClient;
+import com.msl.common.open.RequestConfig;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
 import com.msl.common.utils.LocalDateTimeUtils;
 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.dto.SupervisionLoadInfoDto;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.ocr.v20181119.OcrClient;
@@ -250,6 +255,8 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private OrderChildOperateLimitConfigService orderChildOperateLimitConfigService;
     @Autowired
+    private LoadAppConfig appConfig;
+    @Autowired
     private DriverNoticeConfigService driverNoticeConfigService;
     @Autowired
     private ClxMessageOpenapiFeign clxMessageOpenapiFeign;
@@ -3398,4 +3405,22 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
         return charts;
     }
+
+    @Override
+    public NeedAlertSuperviseInfoResultVO needAlertSuperviseInfo(NeedAlertSuperviseInfoParam param) {
+        App app = appConfig.getPurchaseManageApp();//对接马上来供应链配置信息
+        //组装配置信息
+        RequestConfig config = new RequestConfig()
+                .setAppId(app.getAppNo())
+                .setAppKey(app.getAppKey())
+                .setGatewayUrl(app.getCallback());
+
+        //通过订单号查询监装监卸信息
+        SupplyChainSupervisionLoadAction action = new SupplyChainSupervisionLoadAction();
+        action.setOrderNo(param.getOrderNo());
+        action.setType(param.getType());
+        log.info("请求获取监装监卸信息参数,{}",action);
+        OpenClient.doAction(config, action);
+        return null;
+    }
 }