修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverCarInfo.java

@@ -295,6 +295,12 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
      * 上报失败原因
      */
     private String escalationFailureReason;
+    /**
+     * 交管局上报时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportedDate;
     /**
      * 交管局上报状态key（1未上报3未通过5已通过）
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverInfo.java

@@ -239,6 +239,12 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      * 上报失败原因
      */
     private String escalationFailureReason;
+    /**
+     * 交管局上报时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportedDate;
     /**
      * 交管局上报状态key（1未上报3未通过5已通过）
      */

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

@@ -341,6 +341,12 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
                     HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
                             .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
                     hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
+                    if (hyDriverCarInfo1.getTrailerVehicleType() != null && !hyDriverCarInfo1.getTrailerVehicleType().isEmpty()) {
+                        //查询挂车车辆类型key值
+                        HyCommonSysParameter hyCommonSysParameter3 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                                .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getTrailerVehicleType()));
+                        hyDriverCarInfo1.setTrailerVehicleTypeKey(hyCommonSysParameter3.getConstKey());
+                    }
                     //交管监测系统上报
                     new Thread(new Runnable() {
                         @Override
@@ -359,10 +365,32 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
                                     hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
                                     hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
                                 }
+                                hyDriverCarInfo1.setReportedDate(new Date());
                                 driverCarInfoService.updateById(hyDriverCarInfo1);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
+                            if(hyDriverCarInfo1.getTrailerVehicleType() != null && !hyDriverCarInfo1.getTrailerVehicleType().isEmpty()){
+                                //挂车车辆交管监测系统上报
+                                try {
+                                    String result = MonitoringSystemReporting.testTrailerVehicleRoot(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();
                 }

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

@@ -581,6 +581,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
 //                                String str1 = str.replaceAll(reg, " ").trim();
 //                                str = str1.replaceAll(" +","，");
                                 }
+                                hyDriverInfo1.setReportedDate(new Date());
                                 driverInfoService.updateById(hyDriverInfo1);
                             } catch (Exception e) {
                                 e.printStackTrace();

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -22,6 +22,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -140,8 +141,8 @@ public class EntityAnalyse {
         JSONObject params = new JSONObject();
         List<HyDriverInfo> hyDriverInfos = hyDriverInfo.getHyDriverInfoList();
         //批量上报
-        if (CollectionUtils.isNotEmpty(hyDriverInfos)){
-            for (HyDriverInfo hyDriverInfo1 : hyDriverInfos){
+        if (CollectionUtils.isNotEmpty(hyDriverInfos)) {
+            for (HyDriverInfo hyDriverInfo1 : hyDriverInfos) {
                 params.put("driverName", hyDriverInfo1.getDriverName());
                 params.put("drivingLicense", hyDriverInfo1.getNumberCard());
                 params.put("vehicleClass", hyDriverInfo1.getQuasiDrivingVehicle());
@@ -241,7 +242,7 @@ public class EntityAnalyse {
         }
         DecimalFormat df = new DecimalFormat("0.00");
         if ("非挂车".equals(hyDriverCarInfo.getCarCategory())) {
-            String approvedWeight =df.format(hyDriverCarInfo.getCarApprovedWeight());
+            String approvedWeight = df.format(hyDriverCarInfo.getCarApprovedWeight());
             Double doubleValue = Double.parseDouble(approvedWeight) / 10;
             int intValue = doubleValue.intValue();
             params.put("vehicleTonnage", intValue);
@@ -320,17 +321,17 @@ public class EntityAnalyse {
             vehicleInfoQuery.put("vehiclePlateColorCode", 1);
         }
         vehicleInfoQuery.put("vehicleNumber", orderInfo.getCarNumber());
-        params.put("vehicleInfoQuery",vehicleInfoQuery);
+        params.put("vehicleInfoQuery", vehicleInfoQuery);
         //司机信息
         JSONObject drivers = new JSONObject();
         drivers.put("driverName", orderInfo.getDriverName());
         drivers.put("drivingLicense", orderInfo.getDriverIdCard());
-        params.put("drivers",drivers);
+        params.put("drivers", drivers);
         //货物信息
         JSONObject goodsInfos = new JSONObject();
         goodsInfos.put("descriptionOfGoods", orderInfo.getGoodsType());
         goodsInfos.put("cargoTypeClassificationCode", orderInfo.getGoodsTypeKey());
-        params.put("goodsInfos",goodsInfos);
+        params.put("goodsInfos", goodsInfos);
 
         httpPost.setEntity(new StringEntity("[" + params.toString() + "]", StandardCharsets.UTF_8));
         // 设置header信息
@@ -383,26 +384,26 @@ public class EntityAnalyse {
         JSONArray shippingNoteList = new JSONArray();
         JSONObject shippingNote = new JSONObject();
         shippingNote.put("shippingNoteNumber", hyFreightSettlementInfo.getOrderNo());
-        shippingNote.put("serialNumber","0000");
+        shippingNote.put("serialNumber", "0000");
         shippingNote.put("totalMonetaryAmount", hyFreightSettlementInfo.getAmountMoney() * 1000);
         shippingNote.put("fuelAmount", 0);
         shippingNoteList.add(shippingNote);
-        params.put("shippingNoteList",shippingNoteList);
+        params.put("shippingNoteList", shippingNoteList);
         //财务列表
         JSONArray financialList = new JSONArray();
         JSONObject financial = new JSONObject();
         financial.put("shippingNoteNumber", hyFreightSettlementInfo.getOrderNo());
-        financial.put("serialNumber","0000");
+        financial.put("serialNumber", "0000");
         financial.put("driverName", hyFreightSettlementInfo.getDriverName());
         financial.put("driverLicense", hyFreightSettlementInfo.getDriverIdCard());
         financial.put("paymentMeansCode", "32");
         financial.put("recipient", hyFreightSettlementInfo.getDriverName());
         if ("男".equals(hyFreightSettlementInfo.getDriverSex())) {
-            financial.put("sex",1);
+            financial.put("sex", 1);
         } else {
-            financial.put("sex",2);
+            financial.put("sex", 2);
         }
-        financial.put("sex",1);
+        financial.put("sex", 1);
         String s = hyFreightSettlementInfo.getDriverBirthday().substring(0, hyFreightSettlementInfo.getDriverBirthday().length() - 1);
         String s1 = s.replace("年", "-");
         String s2 = s1.replace("月", "-");
@@ -410,19 +411,19 @@ public class EntityAnalyse {
         financial.put("birthday", df.format(date));
         financial.put("idcardNumber", hyFreightSettlementInfo.getDriverIdCard());
         financial.put("phone", hyFreightSettlementInfo.getDriverPhone());
-        financial.put("address",hyFreightSettlementInfo.getDriverAddress());
+        financial.put("address", hyFreightSettlementInfo.getDriverAddress());
         financial.put("receiptAccount", hyFreightSettlementInfo.getBankCard());
         financial.put("bankCode", hyFreightSettlementInfo.getBankKey());
         financial.put("networkName", hyFreightSettlementInfo.getBankDepositBranch());
         financial.put("sequenceCode", hyFreightSettlementInfo.getSerialNumber());
         DecimalFormat df1 = new DecimalFormat("0.000");
 //        String str = String.valueOf(Double.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney())) * 1000);
-        int intValue1 = (int)(Double.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney())) * 1000);
+        int intValue1 = (int) (Double.valueOf(df1.format(hyFreightSettlementInfo.getAmountMoney())) * 1000);
         financial.put("monetaryAmount", intValue1);
         financial.put("dateTime", f.format(hyFreightSettlementInfo.getPaymentDate()));
         financial.put("payFile", EntityAnalyse.uploadImage(EntityAnalyse.urlToFile(new URL(hyFreightSettlementInfo.getPaymentVoucher())), hyFreightSettlementInfo.getToken()));
         financialList.add(financial);
-        params.put("financialList",financialList);
+        params.put("financialList", financialList);
 
         httpPost.setEntity(new StringEntity("[" + params.toString() + "]", StandardCharsets.UTF_8));
         // 设置header信息
@@ -919,7 +920,7 @@ public class EntityAnalyse {
                 String t2 = t.substring(4, 6);
                 String t3 = t.substring(6, 8);
                 distinguishView.setLicenseIssueDate(t1 + "-" + t2 + "-" + t3);
-                distinguishView.setLssuingAuthority(jsonObject.getString("issue_organization"));
+                distinguishView.setLssuingAuthority(jsonObject.getString("issue_authority"));
                 distinguishView.setVehicleType(jsonObject.getString("vehicle_type"));
                 distinguishView.setCarCode(jsonObject.getString("vin"));
             } else {
@@ -1000,24 +1001,22 @@ public class EntityAnalyse {
      * @throws ServiceException
      */
     public static DistinguishView qualificationLicenseShibie(String image) throws ServiceException {
-
-        String host = "https://dlyzcy.market.alicloudapi.com";
-        String path = "/ai_ocr/dao_lu_lv_ben_lb/v1";
+        String host1 = "https://dlyzcy.market.alicloudapi.com";
+        String path1 = "/ai_ocr/dao_lu_xin_ban_new/v1";
         String method = "POST";
         String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers1 = new HashMap<String, String>();
         //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
-        headers.put("Authorization", "APPCODE " + appcode);
+        headers1.put("Authorization", "APPCODE " + appcode);
         //根据API的要求，定义相对应的Content-Type
-        headers.put("Content-Type", "application/json; charset=UTF-8");
-
-        Map<String, String> querys = new HashMap<String, String>();
-        Map<String, String> bodys = new HashMap<String, String>();
-        bodys.put("IMAGE", image);
-        bodys.put("IMAGE_TYPE", "1");
+        headers1.put("Content-Type", "application/json; charset=UTF-8");
+        Map<String, String> querys1 = new HashMap<String, String>();
+        Map<String, String> bodys1 = new HashMap<String, String>();
+        bodys1.put("IMAGE", image);
+        bodys1.put("IMAGE_TYPE", "1");
 
         //阿里云APPCODE
-        DistinguishView distinguishView = new DistinguishView();
+        DistinguishView distinguishView1 = new DistinguishView();
         try {
             /**
              * 重要提示如下:
@@ -1028,30 +1027,34 @@ public class EntityAnalyse {
              * 相应的依赖请参照
              * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
              */
-            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
+            HttpResponse response = HttpUtils.doPost(host1, path1, method, headers1, querys1, bodys1);
             String body = EntityUtils.toString(response.getEntity());
             System.out.println(body);
             JSONObject jsonObject = JSONObject.parseObject(body);
-            distinguishView.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("有效期限"));
-            distinguishView.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("证号"));
+            distinguishView1.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("有效期至"));
+            distinguishView1.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("从业资格证号"));
+            return distinguishView1;
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (distinguishView.getQualificationCertificate() == null || distinguishView.getQualificationCertificate().isEmpty()) {
-            String host1 = "https://dlyzcy.market.alicloudapi.com";
-            String path1 = "/ai_ocr/dao_lu_xin_ban_new/v1";
-            Map<String, String> headers1 = new HashMap<String, String>();
+
+        if (distinguishView1.getQualificationCertificateNum() == null || distinguishView1.getQualificationCertificateNum().isEmpty()) {
+            String host = "https://dlyzcy.market.alicloudapi.com";
+            String path = "/ai_ocr/dao_lu_lv_ben_lb/v1";
+
+            Map<String, String> headers = new HashMap<String, String>();
             //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
-            headers1.put("Authorization", "APPCODE " + appcode);
+            headers.put("Authorization", "APPCODE " + appcode);
             //根据API的要求，定义相对应的Content-Type
-            headers1.put("Content-Type", "application/json; charset=UTF-8");
-            Map<String, String> querys1 = new HashMap<String, String>();
-            Map<String, String> bodys1 = new HashMap<String, String>();
-            bodys1.put("IMAGE", image);
-            bodys1.put("IMAGE_TYPE", "1");
+            headers.put("Content-Type", "application/json; charset=UTF-8");
+
+            Map<String, String> querys = new HashMap<String, String>();
+            Map<String, String> bodys = new HashMap<String, String>();
+            bodys.put("IMAGE", image);
+            bodys.put("IMAGE_TYPE", "1");
 
             //阿里云APPCODE
-            DistinguishView distinguishView1 = new DistinguishView();
+            DistinguishView distinguishView = new DistinguishView();
             try {
                 /**
                  * 重要提示如下:
@@ -1062,18 +1065,18 @@ public class EntityAnalyse {
                  * 相应的依赖请参照
                  * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
                  */
-                HttpResponse response = HttpUtils.doPost(host1, path1, method, headers1, querys1, bodys1);
+                HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
                 String body = EntityUtils.toString(response.getEntity());
                 System.out.println(body);
                 JSONObject jsonObject = JSONObject.parseObject(body);
-                distinguishView1.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("有效期至"));
-                distinguishView1.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("从业资格证号"));
-                return distinguishView1;
+                distinguishView.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("有效期限"));
+                distinguishView.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("证号"));
+                return distinguishView;
             } catch (Exception e) {
                 e.printStackTrace();
             }
         } else {
-            return distinguishView;
+            return distinguishView1;
         }
         return null;
     }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverCarInfoMapper.xml

@@ -195,7 +195,9 @@
         c.energy_type as energyType,
         c.car_code as carCode,
         c.owner,
+        c.gua_owner as guaOwner,
         c.use_nature as useNature,
+        c.gua_use_nature as guaUseNature,
         c.vehicle_type as vehicleType,
         c.trailer_vehicle_type as trailerVehicleType,
         c.trailer_car_code as trailerCarCode,
@@ -239,6 +241,7 @@
         c.escalation_status_key as escalationStatusKey,
         c.escalation_date as escalationDate,
         c.escalation_failure_reason as escalationFailureReason,
+        c.reported_date as reportedDate,
         c.reported_status_key as reportedStatusKey,
         c.reported_status as reportedStatus,
         c.reported_failure_reason as reportedFailureReason,

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverInfoMapper.xml

@@ -220,6 +220,7 @@
         d.escalation_failure_reason as escalationFailureReason,
         d.escalation_status_key as escalationStatusKey,
         case when d.escalation_status is null then '未认证' else d.escalation_status end as escalationStatus,
+        d.reported_date as reportedDate,
         d.reported_status_key as reportedStatusKey,
         d.reported_status as reportedStatus,
         d.reported_failure_reason as reportedFailureReason,

winsea-haixin-plugin-wangluohuoyun/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -21,6 +21,7 @@ com\yh\saas\plugin\yiliangyiyun\util\HttpUtils.class
 com\yh\saas\plugin\yiliangyiyun\util\Const.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyAcquisitionInfo.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\CarrierInfoServiceImpl.class
+com\yh\saas\plugin\yiliangyiyun\entity\HyCarCaptainInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\EvaluateInfo.class
 com\yh\saas\plugin\yiliangyiyun\controller\PublishTaskInfoController.class
 com\yh\saas\plugin\yiliangyiyun\exception\ThirdPartServiceException.class
@@ -42,6 +43,7 @@ com\yh\saas\plugin\yiliangyiyun\service\IHyTokenService.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\DriverInfoServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyOrderTravelPath.class
 com\yh\saas\plugin\yiliangyiyun\service\ICommonUserService.class
+com\yh\saas\plugin\yiliangyiyun\mapper\HyBindCarCaptainInfoMapper.class
 com\yh\saas\plugin\yiliangyiyun\util\Log.class
 com\yh\saas\plugin\yiliangyiyun\entity\OrderInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\view\Dispatch.class
@@ -54,6 +56,7 @@ com\yh\saas\plugin\yiliangyiyun\controller\DriverInfoController.class
 com\yh\saas\plugin\yiliangyiyun\entity\SessionPojo.class
 com\yh\saas\plugin\yiliangyiyun\mapper\HyCargoOwnerPayeeInfoMapper.class
 com\yh\saas\plugin\yiliangyiyun\service\IHyCargoOwnerCapitalInfoService.class
+com\yh\saas\plugin\yiliangyiyun\service\impl\HyBindCarCaptainInfoServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\controller\CargoOwnerAddressInfoController.class
 com\yh\saas\plugin\yiliangyiyun\entity\FeedbackReport.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyCommonRoute.class
@@ -79,6 +82,7 @@ com\yh\saas\plugin\yiliangyiyun\entity\HyCargoOwnerCapitalInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyDriverInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyDriverCarInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyCarrierInfo.class
+com\yh\saas\plugin\yiliangyiyun\controller\HyBindCarCaptainInfoController.class
 com\yh\saas\plugin\yiliangyiyun\mapper\SearchRecordsInfoMapper.class
 com\yh\saas\plugin\yiliangyiyun\controller\CargoOwnerCompInfoController.class
 com\yh\saas\plugin\yiliangyiyun\service\IDriverCarInfoService.class
@@ -104,6 +108,7 @@ com\yh\saas\plugin\yiliangyiyun\service\impl\HyFreezingMoneyInfoServiceImpl.clas
 com\yh\saas\plugin\yiliangyiyun\service\impl\PatformAnagementEgulationsServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\service\IFreightInfoService.class
 com\yh\saas\plugin\yiliangyiyun\util\SM2Utils.class
+com\yh\saas\plugin\yiliangyiyun\controller\HyCarCaptainInfoController.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\HyOrderTravelPathServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\controller\ClothingColorController.class
 com\yh\saas\plugin\yiliangyiyun\controller\CompanyInfoController.class
@@ -119,6 +124,7 @@ com\yh\saas\plugin\yiliangyiyun\entity\HyAgentCargoOwnerInfo.class
 com\yh\saas\plugin\yiliangyiyun\entity\PublishTaskInfo.class
 com\yh\saas\plugin\yiliangyiyun\mapper\FreightInfoMapper.class
 com\yh\saas\plugin\yiliangyiyun\mapper\ProvinceCityInfoMapper.class
+com\yh\saas\plugin\yiliangyiyun\mapper\HyCarCaptainInfoMapper.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyCargoOwnerInfo.class
 com\yh\saas\plugin\yiliangyiyun\service\IFleetMemberInfoService.class
 com\yh\saas\plugin\yiliangyiyun\controller\HyPublicConsultationController.class
@@ -196,6 +202,7 @@ com\yh\saas\plugin\yiliangyiyun\exception\ExceptionDefinition.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\NewsInfoServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\util\EntCoordUtil.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyOperLog.class
+com\yh\saas\plugin\yiliangyiyun\service\IHyBindCarCaptainInfoService.class
 com\yh\saas\plugin\yiliangyiyun\mapper\HyTokenMapper.class
 com\yh\saas\plugin\yiliangyiyun\mapper\HyOperLogMapper.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyAppVersion.class
@@ -206,6 +213,7 @@ com\yh\saas\plugin\yiliangyiyun\entity\HyDriverCarInfo$QueryFiles.class
 com\yh\saas\plugin\yiliangyiyun\entity\view\GpsView.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\CommonSysParameterServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\FleetMemberInfoServiceImpl.class
+com\yh\saas\plugin\yiliangyiyun\service\IHyCarCaptainInfoService.class
 com\yh\saas\plugin\yiliangyiyun\service\IFeedbackReportService.class
 com\yh\saas\plugin\yiliangyiyun\util\SM3Digest.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyPublicConsultation.class
@@ -265,6 +273,7 @@ com\yh\saas\plugin\yiliangyiyun\controller\HyFreightSettlementInfoController.cla
 com\yh\saas\plugin\yiliangyiyun\constant\ImageCensorConsts.class
 com\yh\saas\plugin\yiliangyiyun\controller\FeedbackReportController.class
 com\yh\saas\plugin\yiliangyiyun\service\IAgentCargoOwnerInfoService.class
+com\yh\saas\plugin\yiliangyiyun\service\impl\HyCarCaptainInfoServiceImpl.class
 com\yh\saas\plugin\yiliangyiyun\util\HttpUtil.class
 com\yh\saas\plugin\yiliangyiyun\mapper\HyPublicConsultationMapper.class
 com\yh\saas\plugin\yiliangyiyun\mapper\CommonUserMapper.class
@@ -296,6 +305,7 @@ com\yh\saas\plugin\yiliangyiyun\controller\CommonRouteController.class
 com\yh\saas\plugin\yiliangyiyun\entity\HyCarrierInfo$QueryFiles.class
 com\yh\saas\plugin\yiliangyiyun\exception\ServiceException.class
 com\yh\saas\plugin\yiliangyiyun\service\impl\VehicleTrajectoryInfoServiceImpl.class
+com\yh\saas\plugin\yiliangyiyun\entity\HyBindCarCaptainInfo.class
 com\yh\saas\plugin\yiliangyiyun\service\ICompanyInfoService.class
 com\yh\saas\plugin\yiliangyiyun\controller\AgentCargoOwnerInfoController.class
 com\yh\saas\plugin\yiliangyiyun\controller\CarrierInfoController.class

winsea-haixin-plugin-wangluohuoyun/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -22,6 +22,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\QrCodeCreateUtil.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\SearchRecordsInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\VehicleTrajectoryInfo.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\HyBindCarCaptainInfoServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\ClothingColorController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\CaptchaUtils.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyOrderTravelPath.java
@@ -56,6 +57,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\PatformAnagementEgulations.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\PatformAnagementEgulationsController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\AgentCargoOwnerInfoMapper.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\HyCarCaptainInfoMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\QRCodeUtil.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\view\Driver.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\FleetInfoMapper.java
@@ -102,6 +104,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\PostUtils.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\SMSClientYlyy.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\view\WarehouseView.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\HyBindCarCaptainInfoMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\YinghangController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IAppVersionService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IHyCargoOwnerCapitalInfoService.java
@@ -136,7 +139,9 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\view\UserDefinedBean.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\CommonSysParameterMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\ICargoOwnerCompInfoService.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IHyBindCarCaptainInfoService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\FleetMemberInfoMapper.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyBindCarCaptainInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\CargoOwnerInfoMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\FleetInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\CargoOwnerInfoServiceImpl.java
@@ -160,6 +165,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\PublishTaskInfoServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\Cipher.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\HyCargoOwnerPayeeInfoServiceImpl.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\HyBindCarCaptainInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\HyCargoOwnerPayeeInfoMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IDriverPayeeInfoService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\ImportExcel.java
@@ -196,6 +202,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\VehicleTrajectoryInfoMapper.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyCargoOwnerPayeeInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\mapper\NewsInfoMapper.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\HyCarCaptainInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\FileUtil.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\CompanyInfoServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\DriverInfoServiceImpl.java
@@ -223,12 +230,14 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IPublishTaskInfoService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IHyDriverCapitalInfoService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\FreightInfoController.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\HyCarCaptainInfoServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\CalculationUtil.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\AjaxResult.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\CommonUserServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\FleetMemberInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\NewsInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\HyTokenController.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\IHyCarCaptainInfoService.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\HyCargoOwnerCapitalInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\view\BiViewInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\HyCargoOwnerCapitalInfoServiceImpl.java
@@ -253,6 +262,7 @@ E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\service\impl\ProvinceCityInfoServiceImpl.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\util\RandomUtil.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\view\Dispatch.java
+E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyCarCaptainInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\controller\RepaymentInfoController.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyAcquisitionInfo.java
 E:\project\wangluohuoyun\winsea-haixin-plugin-wangluohuoyun\src\main\java\com\yh\saas\plugin\yiliangyiyun\entity\HyCompanyInfo.java