1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -997,62 +997,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     //驾驶员监测系统上报
                     HyDriverInfo hyDriverInfo1 = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
                             .eq("common_id",orderInfo1.getCommonId()).eq("delete_flag","0"));
-                    new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                String result = MonitoringSystemReporting.testDriverRoot(hyDriverInfo1);
-                                JSONObject jsonObject = JSONObject.fromObject(result);
-                                //发送成功
-                                if ("1001".equals(jsonObject.getString("code"))) {
-                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
-                                }
-                                //发送失败
-                                else if ("3003".equals(jsonObject.getString("code"))) {
-                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                    hyDriverInfo1.setReportedFailureReason(jsonObject.getString("data"));
-                                }
-                                driverInfoService.updateById(hyDriverInfo1);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }).start();
-
                     //车辆监测系统上报
                     HyDriverCarInfo hyDriverCarInfo1 = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
-                    .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
+                            .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
                     //查询车辆类型key值
                     HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
                             .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
                     hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
-                    //交管监测系统上报
-                    new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                String result = MonitoringSystemReporting.testVehicleRoot(hyDriverCarInfo1);
-                                JSONObject jsonObject = JSONObject.fromObject(result);
-                                //发送成功
-                                if ("1001".equals(jsonObject.getString("code"))) {
-                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
-                                }
-                                //发送失败
-                                else if ("3003".equals(jsonObject.getString("code"))) {
-                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                    hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
-                                }
-                                driverCarInfoService.updateById(hyDriverCarInfo1);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }).start();
-
                     //1.查询任务,获取业务类型代码
                     PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectById(orderInfo1.getTaskId());
                     if (publishTaskInfo != null) {
@@ -1115,10 +1066,49 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         }
                     }
 
-                    //监测系统上报
+
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
+                            //司机
+                            try {
+                                String result = MonitoringSystemReporting.testDriverRoot(hyDriverInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    hyDriverInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    hyDriverInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    hyDriverInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                }
+                                driverInfoService.updateById(hyDriverInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            //交管监测系统上报
+                            try {
+                                String result = MonitoringSystemReporting.testVehicleRoot(hyDriverCarInfo1);
+                                JSONObject jsonObject = JSONObject.fromObject(result);
+                                //发送成功
+                                if ("1001".equals(jsonObject.getString("code"))) {
+                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                }
+                                //发送失败
+                                else if ("3003".equals(jsonObject.getString("code"))) {
+                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                    hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                }
+                                driverCarInfoService.updateById(hyDriverCarInfo1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            //运单监测系统上报
                             try {
                                 String result = MonitoringSystemReporting.testDispatch(orderInfo1);
                                 JSONObject jsonObject = JSONObject.fromObject(result);
@@ -1139,6 +1129,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             }
                         }
                     }).start();
+//                    new Thread(new Runnable() {
+//                        @Override
+//                        public void run() {
+//
+//                        }
+//                    }).start();
                 }
             }
             return "ok";