b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整定位

Browse Source
This commit is contained in:
b2894lxlx
2026-09-18 22:12:43 +08:00
parent a2e23ea264
commit 380fd117c5
11 changed files with 96 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+2 -2
View File
@@ -182,7 +182,7 @@ public class DeptController extends BladeController {
@Operation(summary = "同步OA公司")
public R<OaOrgSyncPageVO> syncOaCompany(
@RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "50") Integer size) {
@RequestParam(defaultValue = "20") Integer size) {
return R.data(oaSyncService.syncCompanyPage(current, size));
}
@@ -195,7 +195,7 @@ public class DeptController extends BladeController {
@Operation(summary = "同步OA部门")
public R<OaOrgSyncPageVO> syncOaDepartment(
@RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "50") Integer size) {
@RequestParam(defaultValue = "20") Integer size) {
return R.data(oaSyncService.syncDepartmentPage(current, size));
}
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java
+4 -4
View File
@@ -321,7 +321,7 @@ public class OASyncServiceImpl implements IOASyncService {
*/
private OaOrgSyncPageVO syncCompanyFromOaPage(int current, int size) {
int pageNo = current < 1 ? 1 : current;
int pageSize = size < 1 ? 50 : Math.min(size, 200);
int pageSize = size < 1 ? 20 : Math.min(size, 200);
OACompanySearch companySearch = buildCompanySearch(null);
companySearch.setCurPage(pageNo);
companySearch.setPageSize(pageSize);
@@ -355,7 +355,7 @@ public class OASyncServiceImpl implements IOASyncService {
*/
private OaOrgSyncPageVO syncDepartmentFromOaPage(int current, int size) {
int pageNo = current < 1 ? 1 : current;
int pageSize = size < 1 ? 50 : Math.min(size, 200);
int pageSize = size < 1 ? 20 : Math.min(size, 200);
String subCompanyIds = getSubCompanyIds();
if (StringUtils.isEmpty(subCompanyIds)) {
ComposeLogUtil.getLastLog().warn("未查询到子公司查询参数，跳过部门同步");
@@ -420,7 +420,7 @@ public class OASyncServiceImpl implements IOASyncService {
private OACompanySearch buildCompanySearch(Date startTime) {
OACompanySearch companySearch = new OACompanySearch();
companySearch.setCurPage(1);
companySearch.setPageSize(50);
companySearch.setPageSize(20);
if (startTime != null) {
companySearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
}
@@ -437,7 +437,7 @@ public class OASyncServiceImpl implements IOASyncService {
private OADepartmentSearch buildDepartmentSearch(Date startTime, String subCompanyIds) {
OADepartmentSearch departmentSearch = new OADepartmentSearch();
departmentSearch.setCurPage(1);
departmentSearch.setPageSize(50);
departmentSearch.setPageSize(20);
departmentSearch.setSubcompanyid1(subCompanyIds);
if (startTime != null) {
departmentSearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/WaybillController.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class WaybillController extends BladeController {
@PostMapping("/track")
@ApiOperationSupport(order = 1)
@Operation(summary = "车辆历史轨迹", description = "按运单绑定车牌 + 日期区间调用 LBS_LOCATE")
@Operation(summary = "车辆历史轨迹", description = "按运单绑定车牌 + 日期区间调用 LBS_TRACK")
public R<WaybillTrackVO> track(
@Parameter(description = "运单ID", required = true) @RequestParam Long id,
@Parameter(description = "开始日期 YYYY-MM-DD", required = true) @RequestParam String startDate,
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
+52 -25
View File
@@ -142,8 +142,8 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
public WaybillLocateVO locateVehicle(Long id) {
Waybill waybill = requireWaybillWithVehicleNo(id, "无法实时定位");
String vehicleNo = waybill.getVehicleNo().trim();
LbsLocateResponse response = invokeLbsLocate(id, vehicleNo, new LbsLocateRequest(vehicleNo), "实时定位");
List<Map<String, Object>> pointMaps = extractLbsPointMaps(response.getData());
LbsLocateResponse response = invokeLbs(id, vehicleNo, new LbsLocateRequest(vehicleNo), false, "实时定位");
List<Map<String, Object>> pointMaps = extractLbsPointMaps(response);
if (pointMaps.isEmpty()) {
throw new ServiceException("暂无车辆实时定位数据");
}
@@ -159,9 +159,9 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
if (LocalDate.parse(normalizedStart).isAfter(LocalDate.parse(normalizedEnd))) {
throw new ServiceException("开始日期不能晚于结束日期");
}
LbsLocateResponse response = invokeLbsLocate(id, vehicleNo,
new LbsLocateRequest(vehicleNo, normalizedStart, normalizedEnd), "历史轨迹");
List<Map<String, Object>> pointMaps = extractLbsPointMaps(response.getData());
LbsLocateResponse response = invokeLbs(id, vehicleNo,
new LbsLocateRequest(vehicleNo, normalizedStart, normalizedEnd), true, "历史轨迹");
List<Map<String, Object>> pointMaps = extractLbsPointMaps(response);
WaybillTrackVO trackVO = new WaybillTrackVO();
trackVO.setWaybillId(id);
trackVO.setVehicleNo(vehicleNo);
@@ -195,10 +195,11 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
return waybill;
}
private LbsLocateResponse invokeLbsLocate(Long waybillId, String vehicleNo, LbsLocateRequest request, String scene) {
private LbsLocateResponse invokeLbs(Long waybillId, String vehicleNo, LbsLocateRequest request,
boolean trackMode, String scene) {
LbsLocateResponse response;
try {
response = lbsClient.locate(request);
response = trackMode ? lbsClient.track(request) : lbsClient.locate(request);
} catch (Exception exception) {
log.error("调用LBS{}失败 waybillId={}, vehicleNo={}", scene, waybillId, vehicleNo, exception);
throw new ServiceException("调用车辆" + scene + "接口失败");
@@ -223,29 +224,55 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
}
/**
* 提取 LBS 轨迹点列表，兼容 data 数组 或 data.list 数组
* 提取 LBS 轨迹点：优先 list，其次 obj，再兼容 data / data.list / data.obj
*/
private List<Map<String, Object>> extractLbsPointMaps(JsonNode dataNode) {
private List<Map<String, Object>> extractLbsPointMaps(LbsLocateResponse response) {
List<Map<String, Object>> pointMaps = new ArrayList<>();
if (dataNode == null || dataNode.isNull()) {
if (response == null) {
return pointMaps;
}
JsonNode listNode = dataNode;
if (dataNode.isObject() && dataNode.has("list")) {
listNode = dataNode.get("list");
appendLbsNodes(pointMaps, response.getList());
if (!pointMaps.isEmpty()) {
return pointMaps;
}
if (listNode != null && listNode.isArray()) {
for (JsonNode item : listNode) {
appendLbsNodes(pointMaps, response.getObj());
if (!pointMaps.isEmpty()) {
return pointMaps;
}
JsonNode dataNode = response.getData();
if (dataNode != null && !dataNode.isNull()) {
if (dataNode.isObject() && dataNode.has("list")) {
appendLbsNodes(pointMaps, dataNode.get("list"));
if (!pointMaps.isEmpty()) {
return pointMaps;
}
}
if (dataNode.isObject() && dataNode.has("obj")) {
appendLbsNodes(pointMaps, dataNode.get("obj"));
if (!pointMaps.isEmpty()) {
return pointMaps;
}
}
appendLbsNodes(pointMaps, dataNode);
}
return pointMaps;
}
private void appendLbsNodes(List<Map<String, Object>> pointMaps, JsonNode node) {
if (node == null || node.isNull()) {
return;
}
if (node.isArray()) {
for (JsonNode item : node) {
if (item != null && item.isObject()) {
pointMaps.add(JsonUtil.toMap(item.toString()));
}
}
return pointMaps;
return;
}
if (dataNode.isObject()) {
pointMaps.add(JsonUtil.toMap(dataNode.toString()));
if (node.isObject()) {
pointMaps.add(JsonUtil.toMap(node.toString()));
}
return pointMaps;
}
/**
@@ -271,10 +298,10 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
target.setLongitude(firstDecimal(pointMap, "longitude", "lon", "lng", "x", "jd", "Longitude", "LON", "LNG", "JD", "X"));
target.setLatitude(firstDecimal(pointMap, "latitude", "lat", "y", "wd", "Latitude", "LAT", "WD", "Y"));
target.setAddress(firstText(pointMap, "address", "addr", "adr", "wz", "Address", "ADDR", "ADR"));
target.setLocateTime(firstText(pointMap, "locationTime", "pos_time", "locateTime", "gpsTime", "gpstime", "time", "gpszdsj", "GPSTime", "Time"));
target.setSpeed(firstText(pointMap, "speed", "v", "sd", "Speed", "SD", "V"));
target.setLocateTime(firstText(pointMap, "utc", "locationTime", "pos_time", "locateTime", "gpsTime", "gpstime", "time", "gpszdsj", "GPSTime", "Time"));
target.setSpeed(firstText(pointMap, "spd", "speed", "v", "sd", "Speed", "SD", "V"));
target.setDirection(firstText(pointMap, "direct", "direction", "h", "fx", "Direction", "FX", "course", "H"));
String responseVehicleNo = firstText(pointMap, "cph", "vehicleNo", "plateNo", "CPH");
String responseVehicleNo = firstText(pointMap, "vno", "cph", "vehicleNo", "plateNo", "CPH", "VNO");
if (Func.isNotEmpty(responseVehicleNo)) {
target.setVehicleNo(responseVehicleNo);
}
@@ -284,10 +311,10 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
target.setLongitude(firstDecimal(pointMap, "longitude", "lon", "lng", "x", "jd", "Longitude", "LON", "LNG", "JD", "X"));
target.setLatitude(firstDecimal(pointMap, "latitude", "lat", "y", "wd", "Latitude", "LAT", "WD", "Y"));
target.setAddress(firstText(pointMap, "address", "addr", "adr", "wz", "Address", "ADDR", "ADR"));
target.setLocateTime(firstText(pointMap, "locationTime", "pos_time", "locateTime", "gpsTime", "gpstime", "time", "gpszdsj", "GPSTime", "Time"));
target.setSpeed(firstText(pointMap, "speed", "v", "sd", "Speed", "SD", "V"));
target.setLocateTime(firstText(pointMap, "utc", "locationTime", "pos_time", "locateTime", "gpsTime", "gpstime", "time", "gpszdsj", "GPSTime", "Time"));
target.setSpeed(firstText(pointMap, "spd", "speed", "v", "sd", "Speed", "SD", "V"));
target.setDirection(firstText(pointMap, "direct", "direction", "h", "fx", "Direction", "FX", "course", "H"));
String responseVehicleNo = firstText(pointMap, "cph", "vehicleNo", "plateNo", "CPH");
String responseVehicleNo = firstText(pointMap, "vno", "cph", "vehicleNo", "plateNo", "CPH", "VNO");
if (Func.isNotEmpty(responseVehicleNo)) {
target.setVehicleNo(responseVehicleNo);
}
blade-service/blade-transport/src/main/resources/application-dev.yml
+1
View File
@@ -14,4 +14,5 @@ thirdParty:
lbs:
baseUrl: ${LBS_BASE_URL:http://172.16.204.83:38000}
locateUrl: ${LBS_LOCATE_URL:/gwzh/LBS/LBS_LOCATE}
trackUrl: ${LBS_TRACK_URL:/gwzh/LBS/LBS_TRACK}
authorization: ${LBS_AUTHORIZATION:${OA_AUTHORIZATION:${IAM_SSO_AUTHORIZATION:Z3d6aF90bXMtOVJJU0RVN1U6YW0yYkcwWnBJZ0RQZmtrSjNaZkZjUDBSaGFuSEtxQng=}}}