From 07f26b29ec4532349f8d05001d339d909422e401 Mon Sep 17 00:00:00 2001
From: 曾富康 <1067864236@qq.com>
Date: 星期四, 25 六月 2026 16:03:54 +0800
Subject: [PATCH] 新增需求
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java | 10
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java | 1
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 14 +-
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 3
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 2
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 166 +++++++++++++++++++++++++++
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 4
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html | 10
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java | 12 +-
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 6
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java | 15 +
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 4
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java | 18 +-
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverProfileAuditMapper.xml | 6
ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 4
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java | 33 +++++
ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 8
17 files changed, 264 insertions(+), 52 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index a548e9b..019b0d4 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -22,6 +22,7 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.model.vo.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.GeodesyUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.WeChatUtil;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -131,6 +132,9 @@
@Autowired
private WeChatUtil weChatUtil;
+
+ @Autowired
+ private GeodesyUtil geodesyUtil;
/**
* 获取短信验证码
@@ -469,9 +473,171 @@
return null;
}).filter(Objects::nonNull).collect(Collectors.toList());
}
+// addMockNearbyDrivers(collect);
return ResultUtil.success(collect);
}
+ /**
+ * 司机端首页订单热力图。
+ * 热力图统计的是订单起点位置，不统计司机位置；订单坐标统一取 startLon/startLat。
+ * radius 为前端传入的查询半径，单位公里；不传时默认查询 5 公里范围内的可接订单。
+ * 返回结果只包含热力图必要字段，不返回订单ID、乘客信息、地址等敏感数据。
+ */
+ @ResponseBody
+ @PostMapping("/base/driver/queryNearbyOrderHeatMap")
+ @ApiOperation(value = "司机端首页订单热力图", tags = {"司机端-首页"}, notes = "热力图统计订单位置，不统计司机位置")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "司机当前位置经度", name = "lon", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "司机当前位置纬度", name = "lat", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "查询半径，单位公里，不传默认5公里", name = "radius", required = false, dataType = "String"),
+ @ApiImplicitParam(value = "订单业务类型：1=专车，2=出租车，3=跨城，4/5=小件物流，不传查询全部", name = "type", required = false, dataType = "int")
+ })
+ public ResultUtil<Map<String, Object>> queryNearbyOrderHeatMap(String lon, String lat, String radius, Integer type) {
+ try {
+ if (ToolUtil.isEmpty(lon) || ToolUtil.isEmpty(lat)) {
+ return ResultUtil.paranErr();
+ }
+ Double centerLon = Double.valueOf(lon);
+ Double centerLat = Double.valueOf(lat);
+ Double radiusKm = ToolUtil.isEmpty(radius) ? 5D : Double.valueOf(radius);
+ if (radiusKm <= 0) {
+ return ResultUtil.paranErr();
+ }
+
+ List<Map<String, Object>> points = new ArrayList<>();
+ String centerLonLat = centerLon + "," + centerLat;
+
+ if (type == null || type == 1) {
+ List<OrderPrivateCar> privateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>()
+ .eq("state", 1).isNotNull("startLon").isNotNull("startLat"));
+ addOrderHeatMapPoints(points, privateCars, centerLonLat, radiusKm, 1);
+ }
+ if (type == null || type == 2) {
+ List<OrderTaxi> taxis = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>()
+ .eq("state", 1).isNotNull("startLon").isNotNull("startLat"));
+ addOrderHeatMapPoints(points, taxis, centerLonLat, radiusKm, 2);
+ }
+ if (type == null || type == 3) {
+ List<OrderCrossCity> crossCities = orderCrossCityService.selectList(new EntityWrapper<OrderCrossCity>()
+ .eq("state", 1).isNotNull("startLon").isNotNull("startLat"));
+ addOrderHeatMapPoints(points, crossCities, centerLonLat, radiusKm, 3);
+ }
+ if (type == null || type == 4 || type == 5) {
+ Wrapper<OrderLogistics> wrapper = new EntityWrapper<OrderLogistics>()
+ .eq("state", 1).isNotNull("startLon").isNotNull("startLat");
+ if (type != null) {
+ wrapper.eq("type", type);
+ }
+ List<OrderLogistics> logistics = orderLogisticsService.selectList(wrapper);
+ addOrderHeatMapPoints(points, logistics, centerLonLat, radiusKm, null);
+ }
+
+ Map<String, Object> data = new HashMap<>();
+// addMockOrderHeatMapPoints(points);
+ data.put("centerLon", centerLon);
+ data.put("centerLat", centerLat);
+ data.put("radius", radiusKm);
+ data.put("total", points.size());
+ data.put("points", points);
+ return ResultUtil.success(data);
+ } catch (NumberFormatException e) {
+ return ResultUtil.paranErr();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 将指定业务的订单转换为热力点，并按半径过滤。
+ * 每个订单默认生成一个热力点，count=1；小件物流使用订单自身 type 区分 4/5。
+ */
+ private void addOrderHeatMapPoints(List<Map<String, Object>> points, List<?> orders, String centerLonLat, Double radiusKm, Integer fixedType) {
+ if (ToolUtil.isEmpty(orders)) {
+ return;
+ }
+ for (Object order : orders) {
+ Double startLon = null;
+ Double startLat = null;
+ Integer orderType = fixedType;
+ if (order instanceof OrderPrivateCar) {
+ OrderPrivateCar orderPrivateCar = (OrderPrivateCar) order;
+ startLon = orderPrivateCar.getStartLon();
+ startLat = orderPrivateCar.getStartLat();
+ } else if (order instanceof OrderTaxi) {
+ OrderTaxi orderTaxi = (OrderTaxi) order;
+ startLon = orderTaxi.getStartLon();
+ startLat = orderTaxi.getStartLat();
+ } else if (order instanceof OrderCrossCity) {
+ OrderCrossCity orderCrossCity = (OrderCrossCity) order;
+ startLon = orderCrossCity.getStartLon();
+ startLat = orderCrossCity.getStartLat();
+ } else if (order instanceof OrderLogistics) {
+ OrderLogistics orderLogistics = (OrderLogistics) order;
+ startLon = orderLogistics.getStartLon();
+ startLat = orderLogistics.getStartLat();
+ orderType = orderLogistics.getType();
+ }
+ if (startLon == null || startLat == null) {
+ continue;
+ }
+
+ Map<String, Double> distance = geodesyUtil.getDistance(centerLonLat, startLon + "," + startLat);
+ if (distance == null || distance.get("WGS84") == null || distance.get("WGS84") > radiusKm * 1000) {
+ continue;
+ }
+
+ Map<String, Object> point = new HashMap<>();
+ point.put("lon", startLon);
+ point.put("lat", startLat);
+ point.put("count", 1);
+ point.put("type", orderType);
+ points.add(point);
+ }
+ }
+
+ /**
+ * 测试用司机假数据：在 104.05,30.59 附近补充 5 个司机位置，便于前端联调地图展示。
+ */
+ private void addMockNearbyDrivers(List<Map<String, Object>> collect) {
+ double[][] mockPositions = {
+ {104.0500, 30.5900},
+ {104.0512, 30.5908},
+ {104.0489, 30.5894},
+ {104.0520, 30.5886},
+ {104.0495, 30.5915}
+ };
+ for (int i = 0; i < mockPositions.length; i++) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("driverId", -1001 - i);
+ map.put("name", "测试司机" + (i + 1));
+ map.put("lot", mockPositions[i][0]);
+ map.put("lat", mockPositions[i][1]);
+ collect.add(map);
+ }
+ }
+
+ /**
+ * 测试用订单热力图假数据：在 104.05,30.59 附近补充 5 个订单热力点，便于前端联调热力图展示。
+ */
+ private void addMockOrderHeatMapPoints(List<Map<String, Object>> points) {
+ double[][] mockPositions = {
+ {104.0500, 30.5900},
+ {104.0510, 30.5906},
+ {104.0490, 30.5892},
+ {104.0522, 30.5888},
+ {104.0487, 30.5913}
+ };
+ for (int i = 0; i < mockPositions.length; i++) {
+ Map<String, Object> point = new HashMap<>();
+ point.put("lon", mockPositions[i][0]);
+ point.put("lat", mockPositions[i][1]);
+ point.put("count", 1);
+ point.put("type", i + 1);
+ points.add(point);
+ }
+ }
+
@ResponseBody
@PostMapping("/api/driver/queryOrderDataFromDriver")
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 3d128c2..b0b494e 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -535,6 +535,9 @@
a.businessMoney as businessMoney,
a.laveBusinessMoney as laveBusinessMoney,
a.taxiAptitudeCard as taxiAptitudeCard,
+ a.peopleAndVehiclesImg as peopleAndVehiclesImg,
+ a.vehicleOperationCertificateImg as vehicleOperationCertificateImg,
+ a.enterpriseName as enterpriseName,
DATE_FORMAT(a.networkCarlssueDate, '%Y-%m-%d') as networkCarlssueDate,
a.driverContactAddress_ as driverContactAddress_,
a.idCard as idCard,
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
index ba127d8..4471510 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java
@@ -401,17 +401,17 @@
private Integer isSynchronous;
@ApiModelProperty("从业资格证图片")
- private String qualificationCertificateImg;
+ private String peopleAndVehiclesImg;
@ApiModelProperty("车辆运营证图片")
private String vehicleOperationCertificateImg;
- public String getQualificationCertificateImg() {
- return qualificationCertificateImg;
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
}
- public void setQualificationCertificateImg(String qualificationCertificateImg) {
- this.qualificationCertificateImg = qualificationCertificateImg;
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
}
public String getVehicleOperationCertificateImg() {
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
index ebbce2c..cf2f197 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
@@ -48,8 +48,8 @@
private String taxiAptitudeCard;
@TableField("networkCarlssueImg")
private String networkCarlssueImg;
- @TableField("qualificationCertificateImg")
- private String qualificationCertificateImg;
+ @TableField("peopleAndVehiclesImg")
+ private String peopleAndVehiclesImg;
@TableField("vehicleOperationCertificateImg")
private String vehicleOperationCertificateImg;
@TableField("placeOfPractice")
@@ -218,12 +218,12 @@
this.networkCarlssueImg = networkCarlssueImg;
}
- public String getQualificationCertificateImg() {
- return qualificationCertificateImg;
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
}
- public void setQualificationCertificateImg(String qualificationCertificateImg) {
- this.qualificationCertificateImg = qualificationCertificateImg;
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
}
public String getVehicleOperationCertificateImg() {
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 62a29a2..f4d62fd 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -427,7 +427,7 @@
audit.setDriverContactAddress(registeredWarpper.getDriverContactAddress());
audit.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_());
audit.setPlaceOfPractice(registeredWarpper.getPlaceOfPractice());
- audit.setQualificationCertificateImg(registeredWarpper.getQualificationCertificateImg());
+ audit.setPeopleAndVehiclesImg(registeredWarpper.getPeopleAndVehiclesImg());
audit.setVehicleOperationCertificateImg(registeredWarpper.getVehicleOperationCertificateImg());
audit.setDriverAge(driverAge);
audit.setDriveCardImgUrl(registeredWarpper.getDriveCardImgUrl());
@@ -471,7 +471,7 @@
driver.setDriverContactAddress(registeredWarpper.getDriverContactAddress());
driver.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_());
driver.setPlaceOfPractice(registeredWarpper.getPlaceOfPractice());
- driver.setQualificationCertificateImg(registeredWarpper.getQualificationCertificateImg());
+ driver.setPeopleAndVehiclesImg(registeredWarpper.getPeopleAndVehiclesImg());
driver.setVehicleOperationCertificateImg(registeredWarpper.getVehicleOperationCertificateImg());
driver.setPlaceOfPractice(registeredWarpper.getPlaceOfPractice());
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
index ab1b470..bc64607 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DriverInfoWarpper.java
@@ -53,6 +53,12 @@
private String idCardImgUrl1;
@ApiModelProperty("身份证背面照")
private String idCardImgUrl2;
+ @ApiModelProperty("人车图片")
+ private String peopleAndVehiclesImg;
+ @ApiModelProperty("车辆运营证图片")
+ private String vehicleOperationCertificateImg;
+ @ApiModelProperty("所属企业")
+ private String enterpriseName;
@ApiModelProperty("初次领取驾驶证日期")
private String getDriverLicenseDate;
@ApiModelProperty("服务模式（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）多个以逗号分隔")
@@ -77,6 +83,14 @@
private Integer isOpenDriverSelfTrip;
@ApiModelProperty("是否已绑定微信")
private Integer openIdState;
+
+ public String getEnterpriseName() {
+ return enterpriseName;
+ }
+
+ public void setEnterpriseName(String enterpriseName) {
+ this.enterpriseName = enterpriseName;
+ }
public Integer getId() {
return id;
@@ -350,6 +364,22 @@
this.openIdState = openIdState;
}
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
+ }
+
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
+ }
+
+ public String getVehicleOperationCertificateImg() {
+ return vehicleOperationCertificateImg;
+ }
+
+ public void setVehicleOperationCertificateImg(String vehicleOperationCertificateImg) {
+ this.vehicleOperationCertificateImg = vehicleOperationCertificateImg;
+ }
+
@Override
public String toString() {
return "DriverInfoWarpper{" +
@@ -407,6 +437,9 @@
driverInfoWarpper.setIdCard(null != map.get("idCard") ? String.valueOf(map.get("idCard")) : "");
driverInfoWarpper.setIdCardImgUrl1(null != map.get("idCardImgUrl1") ? String.valueOf(map.get("idCardImgUrl1")) : "");
driverInfoWarpper.setIdCardImgUrl2(null != map.get("idCardImgUrl2") ? String.valueOf(map.get("idCardImgUrl2")) : "");
+ driverInfoWarpper.setEnterpriseName(null != map.get("enterpriseName") ? String.valueOf(map.get("enterpriseName")) : "");
+ driverInfoWarpper.setPeopleAndVehiclesImg(null != map.get("peopleAndVehiclesImg") ? String.valueOf(map.get("peopleAndVehiclesImg")) : "");
+ driverInfoWarpper.setVehicleOperationCertificateImg(null != map.get("vehicleOperationCertificateImg") ? String.valueOf(map.get("vehicleOperationCertificateImg")) : "");
driverInfoWarpper.setGetDriverLicenseDate(null != map.get("getDriverLicenseDate") ? String.valueOf(map.get("getDriverLicenseDate")) : "");
driverInfoWarpper.setType(null != map.get("type") ? String.valueOf(map.get("type")) : "");
driverInfoWarpper.setPlaceOfPractice(null != map.get("placeOfPractice") ? String.valueOf(map.get("placeOfPractice")) : "");
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
index 3634132..cbf4c88 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RegisteredWarpper.java
@@ -37,14 +37,16 @@
private String headImgUrl;
@ApiModelProperty("驾驶证照片")
private String driveCardImgUrl;
- @ApiModelProperty("从业资格证图片")
- private String qualificationCertificateImg;
- @ApiModelProperty("从业资格证图片")
+ @ApiModelProperty("人车合照图片")
+ private String peopleAndVehiclesImg;
+ @ApiModelProperty("车辆运营证图片")
private String vehicleOperationCertificateImg;
- @ApiModelProperty("网约车资格证照片")
+ @ApiModelProperty("网约车资格证照片/从业资格证")
private String networkCarlssueImg;
+
@ApiModelProperty("出租车资格证号")
private String taxiAptitudeCard;
+
@ApiModelProperty("省")
private String province;
@@ -67,12 +69,12 @@
@ApiModelProperty("公司id")
private Integer companyId;
- public String getQualificationCertificateImg() {
- return qualificationCertificateImg;
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
}
- public void setQualificationCertificateImg(String qualificationCertificateImg) {
- this.qualificationCertificateImg = qualificationCertificateImg;
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
}
public String getVehicleOperationCertificateImg() {
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index abb36cc..6c23bb5 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1201,7 +1201,7 @@
obj.setTaxiAptitudeCard(tDriver.getTaxiAptitudeCard());
obj.setEnterpriseName(tDriver.getEnterpriseName());
obj.setQualificationCertificateNumber(tDriver.getQualificationCertificateNumber());
- obj.setQualificationCertificateImg(tDriver.getQualificationCertificateImg());
+ obj.setPeopleAndVehiclesImg(tDriver.getPeopleAndVehiclesImg());
obj.setVehicleOperationCertificateNumber(tDriver.getVehicleOperationCertificateNumber());
obj.setVehicleOperationCertificateImg(tDriver.getVehicleOperationCertificateImg());
obj.setJobNumber(tDriver.getJobNumber());
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
index 899a3d5..8fb5935 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.core.exception.GunsException;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.service.ITImgMidService;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverProfileAuditMapper.xml b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverProfileAuditMapper.xml
index 44b3b7f..3476d40 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverProfileAuditMapper.xml
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverProfileAuditMapper.xml
@@ -32,7 +32,7 @@
a.getDriverLicenseDate as getDriverLicenseDate,
a.taxiAptitudeCard as taxiAptitudeCard,
a.networkCarlssueImg as networkCarlssueImg,
- a.qualificationCertificateImg as qualificationCertificateImg,
+ a.peopleAndVehiclesImg as peopleAndVehiclesImg,
a.vehicleOperationCertificateImg as vehicleOperationCertificateImg,
a.placeOfPractice as placeOfPractice,
d.enterpriseName as enterpriseName,
@@ -126,7 +126,7 @@
a.getDriverLicenseDate as getDriverLicenseDate,
a.taxiAptitudeCard as taxiAptitudeCard,
a.networkCarlssueImg as networkCarlssueImg,
- a.qualificationCertificateImg as qualificationCertificateImg,
+ a.peopleAndVehiclesImg as peopleAndVehiclesImg,
a.vehicleOperationCertificateImg as vehicleOperationCertificateImg,
a.placeOfPractice as placeOfPractice,
a.auditState as authState,
@@ -172,7 +172,7 @@
getDriverLicenseDate = #{audit.getDriverLicenseDate},
taxiAptitudeCard = #{audit.taxiAptitudeCard},
networkCarlssueImg = #{audit.networkCarlssueImg},
- qualificationCertificateImg = #{audit.qualificationCertificateImg},
+ peopleAndVehiclesImg = #{audit.peopleAndVehiclesImg},
vehicleOperationCertificateImg = #{audit.vehicleOperationCertificateImg},
placeOfPractice = #{audit.placeOfPractice},
province = #{audit.province},
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index 5de8924..a3f47db 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -40,7 +40,7 @@
<result column="networkCarlssueImg" property="networkCarlssueImg" />
<result column="enterpriseName" property="enterpriseName" />
<result column="qualificationCertificateNumber" property="qualificationCertificateNumber" />
- <result column="qualificationCertificateImg" property="qualificationCertificateImg" />
+ <result column="peopleAndVehiclesImg" property="peopleAndVehiclesImg" />
<result column="vehicleOperationCertificateNumber" property="vehicleOperationCertificateNumber" />
<result column="vehicleOperationCertificateImg" property="vehicleOperationCertificateImg" />
<result column="networkCarlssueOrganization" property="networkCarlssueOrganization" />
@@ -75,7 +75,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, enterpriseName, qualificationCertificateNumber, qualificationCertificateImg, vehicleOperationCertificateNumber, vehicleOperationCertificateImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType
+ id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, enterpriseName, qualificationCertificateNumber, peopleAndVehiclesImg, vehicleOperationCertificateNumber, vehicleOperationCertificateImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType
</sql>
<!--根据条件查询待审核司机列表-->
@@ -131,7 +131,7 @@
case when dd.authState = 1 then '待审核' when dd.authState = 2 then '正常' when dd.authState = 3 then '冻结' when dd.authState = 4 then '已拒绝' end as authStateStr,
dd.enterpriseName as enterpriseName,
dd.qualificationCertificateNumber as qualificationCertificateNumber,
- dd.qualificationCertificateImg as qualificationCertificateImg,
+ dd.peopleAndVehiclesImg as peopleAndVehiclesImg,
dd.vehicleOperationCertificateNumber as vehicleOperationCertificateNumber,
dd.vehicleOperationCertificateImg as vehicleOperationCertificateImg,
dd.* from t_driver as dd
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
index a316e61..9883da4 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverProfileAudit.java
@@ -48,8 +48,8 @@
private String taxiAptitudeCard;
@TableField("networkCarlssueImg")
private String networkCarlssueImg;
- @TableField("qualificationCertificateImg")
- private String qualificationCertificateImg;
+ @TableField("peopleAndVehiclesImg")
+ private String peopleAndVehiclesImg;
@TableField("vehicleOperationCertificateImg")
private String vehicleOperationCertificateImg;
@TableField("placeOfPractice")
@@ -110,8 +110,15 @@
public void setTaxiAptitudeCard(String taxiAptitudeCard) { this.taxiAptitudeCard = taxiAptitudeCard; }
public String getNetworkCarlssueImg() { return networkCarlssueImg; }
public void setNetworkCarlssueImg(String networkCarlssueImg) { this.networkCarlssueImg = networkCarlssueImg; }
- public String getQualificationCertificateImg() { return qualificationCertificateImg; }
- public void setQualificationCertificateImg(String qualificationCertificateImg) { this.qualificationCertificateImg = qualificationCertificateImg; }
+
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
+ }
+
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
+ }
+
public String getVehicleOperationCertificateImg() { return vehicleOperationCertificateImg; }
public void setVehicleOperationCertificateImg(String vehicleOperationCertificateImg) { this.vehicleOperationCertificateImg = vehicleOperationCertificateImg; }
public String getPlaceOfPractice() { return placeOfPractice; }
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 0ac4c99..06229a9 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -174,9 +174,9 @@
*/
private String qualificationCertificateNumber;
/**
- * 从业资格证图片
+ * 人车图片
*/
- private String qualificationCertificateImg;
+ private String peopleAndVehiclesImg;
/**
* 车辆运营证号码
*/
@@ -653,12 +653,12 @@
this.qualificationCertificateNumber = qualificationCertificateNumber;
}
- public String getQualificationCertificateImg() {
- return qualificationCertificateImg;
+ public String getPeopleAndVehiclesImg() {
+ return peopleAndVehiclesImg;
}
- public void setQualificationCertificateImg(String qualificationCertificateImg) {
- this.qualificationCertificateImg = qualificationCertificateImg;
+ public void setPeopleAndVehiclesImg(String peopleAndVehiclesImg) {
+ this.peopleAndVehiclesImg = peopleAndVehiclesImg;
}
public String getVehicleOperationCertificateNumber() {
@@ -985,7 +985,7 @@
", networkCarlssueImg=" + networkCarlssueImg +
", enterpriseName=" + enterpriseName +
", qualificationCertificateNumber=" + qualificationCertificateNumber +
- ", qualificationCertificateImg=" + qualificationCertificateImg +
+ ", peopleAndVehiclesImg=" + peopleAndVehiclesImg +
", vehicleOperationCertificateNumber=" + vehicleOperationCertificateNumber +
", vehicleOperationCertificateImg=" + vehicleOperationCertificateImg +
", networkCarlssueOrganization=" + networkCarlssueOrganization +
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index d396a5c..1887cec 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -108,7 +108,7 @@
</div>
</div>
<#input id="qualificationCertificateNumber" name="从业资格证号码" />
- <#avatar id="qualificationCertificateImg" name="从业资格证图片：" />
+ <#avatar id="peopleAndVehiclesImg" name="人车照片：" />
<#input id="vehicleOperationCertificateNumber" name="车辆运营证号码" />
<#avatar id="vehicleOperationCertificateImg" name="车辆运营证图片：" />
<#input id="jobNumber" name="工号(选填)" />
@@ -270,7 +270,7 @@
</div>
</div>
-<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026061601"></script>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026062501"></script>
<script>
laydate.render({
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index ff79cdd..a01e15f 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -116,7 +116,7 @@
</div>
</div>
<#input id="qualificationCertificateNumber" name="从业资格证号码" value="${item.qualificationCertificateNumber}"/>
- <#avatar id="qualificationCertificateImg" name="从业资格证图片：" avatarImg="${item.qualificationCertificateImg}"/>
+ <#avatar id="peopleAndVehiclesImg" name="人车照片：" avatarImg="${item.peopleAndVehiclesImg}"/>
<#input id="vehicleOperationCertificateNumber" name="车辆运营证号码" value="${item.vehicleOperationCertificateNumber}"/>
<#avatar id="vehicleOperationCertificateImg" name="车辆运营证图片：" avatarImg="${item.vehicleOperationCertificateImg}"/>
<#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
@@ -283,7 +283,7 @@
</div>
</div>
-<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026061601"></script>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js?v=2026062501"></script>
<script type="application/javascript">
laydate.render({
elem: '#getDriverLicenseDate'
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
index f25b491..bcb445d 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -34,21 +34,21 @@
<#label id="enterpriseName" name="所属企业" value="${item.enterpriseName}"/>
<#label id="qualificationCertificateNumber" name="从业资格证号码" value="${item.qualificationCertificateNumber}"/>
<div class="form-group">
- <label class="col-sm-3 control-label">从业资格证图片：</label>
+ <label class="col-sm-3 control-label">人车照片：</label>
<div class="col-sm-9">
<div class="form-group">
<div class="col-sm-6">
- <div id="qualificationCertificateImgPreId">
+ <div id="peopleAndVehiclesImgPreId">
<div>
- @if(isEmpty(item.qualificationCertificateImg)){
+ @if(isEmpty(item.peopleAndVehiclesImg)){
<img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="width:150px;">
@}else{
- <img onclick="lookBigImg('${item.qualificationCertificateImg}')" src="${item.qualificationCertificateImg}" style="width:150px;">
+ <img onclick="lookBigImg('${item.peopleAndVehiclesImg}')" src="${item.peopleAndVehiclesImg}" style="width:150px;">
@}
</div>
</div>
</div>
- <input type="hidden" id="qualificationCertificateImg" name="qualificationCertificateImg" value="${item.qualificationCertificateImg}"/>
+ <input type="hidden" id="peopleAndVehiclesImg" name="peopleAndVehiclesImg" value="${item.peopleAndVehiclesImg}"/>
</div>
</div>
</div>
diff --git a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
index a9a7106..b00701c 100644
--- a/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
+++ b/ManagementYKDTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js
@@ -365,7 +365,7 @@
.set('networkCarlssueImg')
.set('enterpriseName')
.set('qualificationCertificateNumber')
- .set('qualificationCertificateImg')
+ .set('peopleAndVehiclesImg')
.set('vehicleOperationCertificateNumber')
.set('vehicleOperationCertificateImg')
.set('networkCarlssueOrganization')
@@ -718,9 +718,9 @@
var driveCardImgUrl = new $WebUpload("driveCardImgUrl");
driveCardImgUrl.setUploadBarId("progressBar");
driveCardImgUrl.init();
- var qualificationCertificateImg = new $WebUpload("qualificationCertificateImg");
- qualificationCertificateImg.setUploadBarId("progressBar");
- qualificationCertificateImg.init();
+ var peopleAndVehiclesImg = new $WebUpload("peopleAndVehiclesImg");
+ peopleAndVehiclesImg.setUploadBarId("progressBar");
+ peopleAndVehiclesImg.init();
var vehicleOperationCertificateImg = new $WebUpload("vehicleOperationCertificateImg");
vehicleOperationCertificateImg.setUploadBarId("progressBar");
vehicleOperationCertificateImg.init();
--
Gitblit v1.7.1