1

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

@@ -64,79 +64,6 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-<<<<<<< HEAD
-//    @Scheduled(cron = "0 */1 * * * ?")
-    public void queryResults() throws IOException {
-
-        //查询司机上报结果
-        List<HyDriverInfo> hyDriverInfoList = this.selectList(new EntityWrapper<HyDriverInfo>()
-                .eq("escalation_status_key", "5").eq("delete_flag", "0"));
-        if (!CollectionUtils.isEmpty(hyDriverInfoList)) {
-            //获取token
-            String token = EntityAnalyse.GetJTToken(ENV);
-            for (HyDriverInfo hyDriverInfo : hyDriverInfoList) {
-                //上报司机信息校验结果查询
-                hyDriverInfo.setToken(token);
-                if ("通过".equals(EntityAnalyse.driverInfoCheck(hyDriverInfo,ENV))) {
-                    hyDriverInfo.setEscalationStatusKey(StatusEnum.PASSED.getFlag());
-                    hyDriverInfo.setEscalationStatus(StatusEnum.PASSED.getName());
-                } else if ("待校验".equals(EntityAnalyse.driverInfoCheck(hyDriverInfo,ENV))) {
-                    hyDriverInfo.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
-                    hyDriverInfo.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
-                } else {
-                    hyDriverInfo.setEscalationStatusKey(StatusEnum.FAIL.getFlag());
-                    hyDriverInfo.setEscalationStatus(StatusEnum.FAIL.getName());
-                    hyDriverInfo.setEscalationFailureReason(EntityAnalyse.driverInfoCheck(hyDriverInfo,ENV));
-                }
-                this.updateById(hyDriverInfo);
-            }
-        }
-        //查询车辆上报结果
-        List<HyDriverCarInfo> hyDriverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>()
-                .eq("escalation_status_key", "5").eq("delete_flag", "0"));
-        if (!CollectionUtils.isEmpty(hyDriverCarInfoList)) {
-            //获取token
-            String token = EntityAnalyse.GetJTToken(ENV);
-            for (HyDriverCarInfo hyDriverCarInfo : hyDriverCarInfoList) {
-                //上报车辆信息校验结果查询
-                hyDriverCarInfo.setToken(token);
-                if ("通过".equals(EntityAnalyse.driverCarInfoCheck(hyDriverCarInfo,ENV))) {
-                    hyDriverCarInfo.setEscalationStatusKey(StatusEnum.PASSED.getFlag());
-                    hyDriverCarInfo.setEscalationStatus(StatusEnum.PASSED.getName());
-                } else if ("待校验".equals(EntityAnalyse.driverCarInfoCheck(hyDriverCarInfo,ENV))) {
-                    hyDriverCarInfo.setEscalationStatusKey(StatusEnum.PARK_UNDER_REVIEW.getFlag());
-                    hyDriverCarInfo.setEscalationStatus(StatusEnum.PARK_UNDER_REVIEW.getName());
-                } else {
-                    hyDriverCarInfo.setEscalationStatusKey(StatusEnum.FAIL.getFlag());
-                    hyDriverCarInfo.setEscalationStatus(StatusEnum.FAIL.getName());
-                    hyDriverCarInfo.setEscalationFailureReason(EntityAnalyse.driverCarInfoCheck(hyDriverCarInfo,ENV));
-                }
-                driverCarInfoService.updateById(hyDriverCarInfo);
-            }
-        }
-        //查询运单上报结果
-        List<OrderInfo> orderInfoList = orderInfoService.selectList(new EntityWrapper<OrderInfo>()
-                .eq("escalation_status_key", "5").eq("delete_flag", "0"));
-        if (!CollectionUtils.isEmpty(orderInfoList)) {
-            //获取token
-            String token = EntityAnalyse.GetJTToken(ENV);
-            for (OrderInfo orderInfo : orderInfoList) {
-                //上报运单信息校验结果查询
-                orderInfo.setToken(token);
-                if ("通过".equals(EntityAnalyse.waybillCheck(orderInfo,ENV))) {
-                    orderInfo.setEscalationStatusKey(StatusEnum.ADOPTED.getFlag());
-                    orderInfo.setEscalationStatus(StatusEnum.ADOPTED.getName());
-                } else if ("待校验".equals(EntityAnalyse.waybillCheck(orderInfo,ENV))) {
-                    orderInfo.setEscalationStatusKey(StatusEnum.UNDER_REVIEW.getFlag());
-                    orderInfo.setEscalationStatus(StatusEnum.UNDER_REVIEW.getName());
-                } else {
-                    orderInfo.setEscalationStatusKey(StatusEnum.NOT_ADOPT.getFlag());
-                    orderInfo.setEscalationStatus(StatusEnum.NOT_ADOPT.getName());
-                    orderInfo.setEscalationFailureReason(EntityAnalyse.waybillCheck(orderInfo,ENV));
-                }
-                orderInfoService.updateById(orderInfo);
-            }
-=======
     public String queryDriverResult(HyDriverInfo hyDriverInfo) throws IOException {
         //获取token
         String token = EntityAnalyse.GetJTToken(ENV);
@@ -152,7 +79,6 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             hyDriverInfo.setEscalationStatusKey(StatusEnum.FAIL.getFlag());
             hyDriverInfo.setEscalationStatus(StatusEnum.FAIL.getName());
             hyDriverInfo.setEscalationFailureReason(EntityAnalyse.driverInfoCheck(hyDriverInfo, ENV));
->>>>>>> 8cc1a234685bef36b04764bbd54dcd7a3753d140
         }
         this.updateById(hyDriverInfo);
         return "ok";