点击完成生成路径 完成

This commit is contained in:
mmc
2026-02-28 17:06:14 +08:00
parent b55cee7624
commit bcaebade9a
4 changed files with 49 additions and 69 deletions

View File

@@ -4,13 +4,15 @@ class DeviceAddPathPointModel {
DeviceAddPathPointModel({required this.latitude, required this.longitude}); DeviceAddPathPointModel({required this.latitude, required this.longitude});
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {'lat': latitude.toString(), 'lon': longitude.toString()};
'latitude': latitude,
'longitude': longitude,
};
factory DeviceAddPathPointModel.fromJson(Map<String, dynamic> json) => DeviceAddPathPointModel( factory DeviceAddPathPointModel.fromJson(Map<String, dynamic> json) {
latitude: json['latitude'], return DeviceAddPathPointModel(
longitude: json['longitude'], latitude: double.parse((json['lat'] ?? json['latitude']).toString()),
); longitude: double.parse((json['lon'] ?? json['longitude']).toString()),
);
}
@override
String toString() => '{lat: ${latitude.toString()}, lon: ${longitude.toString()}}';
} }

View File

@@ -10,8 +10,8 @@ import '../models/device_add_path_point_model.dart';
import '../models/device_work_area_param_model.dart'; import '../models/device_work_area_param_model.dart';
class PathRepositoryImpl implements PathRepository { class PathRepositoryImpl implements PathRepository {
/* final String baseUrl = 'https://serviceri.satabot.com'; // 后端接口地址*/ /* final String baseUrl = 'https://serviceri.satabot.com'; // 后端接口地址*/
/* final UserStorage localTokenStorage; /* final UserStorage localTokenStorage;
PathRepositoryImpl({ PathRepositoryImpl({
required this.localTokenStorage, // 👈 关键:注入依赖 required this.localTokenStorage, // 👈 关键:注入依赖
});*/ });*/
@@ -23,7 +23,6 @@ class PathRepositoryImpl implements PathRepository {
required OuterBoundary outer, required OuterBoundary outer,
required List<HoleBoundary> holes, required List<HoleBoundary> holes,
required int workType, required int workType,
}) async { }) async {
final url = Uri.parse('https://servicepathplan.satabot.com/api/path'); final url = Uri.parse('https://servicepathplan.satabot.com/api/path');
// ✅ 直接从 GetIt 获取 UserStorage(无需构造函数传参) // ✅ 直接从 GetIt 获取 UserStorage(无需构造函数传参)
@@ -33,10 +32,7 @@ class PathRepositoryImpl implements PathRepository {
if (token == null) throw Exception('请先登录'); if (token == null) throw Exception('请先登录');
// ✅ 设置带 token 的 headers // ✅ 设置带 token 的 headers
final headers = { final headers = {'Content-Type': 'application/json', 'Authorization': token};
'Content-Type': 'application/json',
'Authorization': token,
};
final body = jsonEncode({ final body = jsonEncode({
'reference': reference.toJson(), 'reference': reference.toJson(),
@@ -51,8 +47,10 @@ class PathRepositoryImpl implements PathRepository {
final response = await http.post(url, headers: headers, body: body); final response = await http.post(url, headers: headers, body: body);
print('响应体: ${response.body}'); print('响应体: ${response.body}');
final decoded = jsonDecode(response.body) as Map<String, dynamic>; final decoded = jsonDecode(response.body) as Map<String, dynamic>;
if (decoded['code'] == 200) { print('解码后的响应: $decoded'); // 调试输出解码后的响应
final pathJson = decoded['path']; if (decoded['success'] == true) {
final pathJson = decoded['data']?['path'];
print('路径数据: $pathJson'); // 调试输出路径数据
if (pathJson == null) { if (pathJson == null) {
throw Exception('API returned null for "path"'); throw Exception('API returned null for "path"');
} }
@@ -60,6 +58,8 @@ class PathRepositoryImpl implements PathRepository {
throw Exception('Expected "path" to be a List, but got ${pathJson.runtimeType}'); throw Exception('Expected "path" to be a List, but got ${pathJson.runtimeType}');
} }
final List<dynamic> jsonData = pathJson; final List<dynamic> jsonData = pathJson;
print('路径数据1111: $jsonData'); // 调试输出路径数据
print('路径数据11112222: ${jsonData.map((item) => DeviceAddPathPointModel.fromJson(item)).toList()}');
return jsonData.map((item) => DeviceAddPathPointModel.fromJson(item)).toList(); return jsonData.map((item) => DeviceAddPathPointModel.fromJson(item)).toList();
} else { } else {
throw Exception('Failed to load path: ${response.statusCode}'); throw Exception('Failed to load path: ${response.statusCode}');
@@ -71,18 +71,10 @@ class PathRepositoryImpl implements PathRepository {
// 保存工作记录 // 保存工作记录
@override @override
Future<Map<String, dynamic>> saveWorkRecord({ Future<Map<String, dynamic>> saveWorkRecord({required String workName, required String userId, required String jsonData}) async {
required String workName,
required String userId,
required String jsonData,
}) async {
final url = Uri.parse('https://serviceri.satabot.com/iot/workRecord/add'); final url = Uri.parse('https://serviceri.satabot.com/iot/workRecord/add');
final headers = {'Content-Type': 'application/json'}; final headers = {'Content-Type': 'application/json'};
final body = jsonEncode({ final body = jsonEncode({'workName': workName, 'userId': userId, 'jsonData': jsonData});
'workName': workName,
'userId': userId,
'jsonData': jsonData,
});
try { try {
final response = await http.post(url, headers: headers, body: body); final response = await http.post(url, headers: headers, body: body);
@@ -98,9 +90,7 @@ class PathRepositoryImpl implements PathRepository {
} }
@override @override
Future<List<Map<String, dynamic>>> getWorkRecord({ Future<List<Map<String, dynamic>>> getWorkRecord({required String userId}) async {
required String userId,
}) async {
final timestamp = DateTime.now().millisecondsSinceEpoch; final timestamp = DateTime.now().millisecondsSinceEpoch;
final url = Uri.parse( final url = Uri.parse(
'https://serviceri.satabot.com/iot/workRecord/selectByUserId', 'https://serviceri.satabot.com/iot/workRecord/selectByUserId',
@@ -116,9 +106,7 @@ class PathRepositoryImpl implements PathRepository {
throw Exception('API error: ${data['msg'] ?? 'Unknown'}'); throw Exception('API error: ${data['msg'] ?? 'Unknown'}');
} }
} else { } else {
throw Exception( throw Exception('HTTP ${response.statusCode}: ${response.reasonPhrase}');
'HTTP ${response.statusCode}: ${response.reasonPhrase}',
);
} }
} catch (e) { } catch (e) {
throw Exception('Network error in getWorkRecord: $e'); throw Exception('Network error in getWorkRecord: $e');
@@ -126,16 +114,11 @@ class PathRepositoryImpl implements PathRepository {
} }
@override @override
Future<Map<String, dynamic>> deleteWorkRecord({ Future<Map<String, dynamic>> deleteWorkRecord({required String workName}) async {
required String workName,
}) async {
final timestamp = DateTime.now().millisecondsSinceEpoch; final timestamp = DateTime.now().millisecondsSinceEpoch;
final url = final url = Uri.parse(
Uri.parse( 'https://serviceri.satabot.com/iot/workRecord/deleteByWorkName',
'https://serviceri.satabot.com/iot/workRecord/deleteByWorkName', ).replace(queryParameters: {'workName': workName, '_t': timestamp.toString()});
).replace(
queryParameters: {'workName': workName, '_t': timestamp.toString()},
);
try { try {
final response = await http.get(url); final response = await http.get(url);
@@ -144,9 +127,7 @@ class PathRepositoryImpl implements PathRepository {
if (response.statusCode == 200 && data['code'] == 200) { if (response.statusCode == 200 && data['code'] == 200) {
return data; // 返回 {"code": 200, "msg": "删除成功"} return data; // 返回 {"code": 200, "msg": "删除成功"}
} else { } else {
throw Exception( throw Exception('Delete failed: ${data['msg'] ?? response.reasonPhrase}');
'Delete failed: ${data['msg'] ?? response.reasonPhrase}',
);
} }
} catch (e) { } catch (e) {
throw Exception('Network error in deleteWorkRecord: $e'); throw Exception('Network error in deleteWorkRecord: $e');
@@ -155,16 +136,11 @@ class PathRepositoryImpl implements PathRepository {
/// 选择工作记录 /// 选择工作记录
@override @override
Future<List<Map<String, dynamic>>> selectWorkRecordByName({ Future<List<Map<String, dynamic>>> selectWorkRecordByName({required String workName}) async {
required String workName,
}) async {
final timestamp = DateTime.now().millisecondsSinceEpoch; final timestamp = DateTime.now().millisecondsSinceEpoch;
final url = final url = Uri.parse(
Uri.parse( 'https://serviceri.satabot.com/iot/workRecord/selectByWorkName',
'https://serviceri.satabot.com/iot/workRecord/selectByWorkName', ).replace(queryParameters: {'workName': workName, '_t': timestamp.toString()});
).replace(
queryParameters: {'workName': workName, '_t': timestamp.toString()},
);
try { try {
final response = await http.get(url); final response = await http.get(url);
@@ -188,9 +164,7 @@ class PathRepositoryImpl implements PathRepository {
} else if (rawData is Map) { } else if (rawData is Map) {
records = [Map<String, dynamic>.from(rawData)]; records = [Map<String, dynamic>.from(rawData)];
} else { } else {
throw Exception( throw Exception('Unexpected data type for "data": ${rawData.runtimeType}');
'Unexpected data type for "data": ${rawData.runtimeType}',
);
} }
return records; return records;
@@ -198,9 +172,7 @@ class PathRepositoryImpl implements PathRepository {
throw Exception('API error: ${data['msg'] ?? 'Unknown'}'); throw Exception('API error: ${data['msg'] ?? 'Unknown'}');
} }
} else { } else {
throw Exception( throw Exception('HTTP ${response.statusCode}: ${response.reasonPhrase}');
'HTTP ${response.statusCode}: ${response.reasonPhrase}',
);
} }
} catch (e) { } catch (e) {
throw Exception('Network error in selectWorkRecordByName: $e'); throw Exception('Network error in selectWorkRecordByName: $e');

View File

@@ -59,6 +59,7 @@ class DevicesState extends Equatable {
pathData: pathData ?? this.pathData, pathData: pathData ?? this.pathData,
workRecords: workRecords ?? this.workRecords, workRecords: workRecords ?? this.workRecords,
operationType: operationType ?? this.operationType, // 更新操作类型 operationType: operationType ?? this.operationType, // 更新操作类型
generatedPath: generatedPath ?? this.generatedPath, // 更新生成的路径数据
); );
} }
@@ -69,5 +70,7 @@ class DevicesState extends Equatable {
deviceLongitude, deviceLongitude,
workRecords, workRecords,
pathData, pathData,
operationType,
generatedPath,
]; ];
} }

View File

@@ -11,6 +11,7 @@ import 'package:maibu_satabot_v2/core/app/app_user_cubit.dart';
import 'package:maibu_satabot_v2/core/di/injection.dart'; import 'package:maibu_satabot_v2/core/di/injection.dart';
import 'package:maibu_satabot_v2/core/network/net_message_dispatcher.dart'; import 'package:maibu_satabot_v2/core/network/net_message_dispatcher.dart';
import 'package:maibu_satabot_v2/core/network/protocol_decoder.dart'; import 'package:maibu_satabot_v2/core/network/protocol_decoder.dart';
import 'package:maibu_satabot_v2/features/devices/data/models/device_add_path_point_model.dart' as work_area_model;
import 'package:maibu_satabot_v2/features/devices/data/models/device_work_area_param_model.dart' as work_area_model; import 'package:maibu_satabot_v2/features/devices/data/models/device_work_area_param_model.dart' as work_area_model;
import 'package:maibu_satabot_v2/features/devices/data/repositories/generate_path_repository_Impl.dart'; import 'package:maibu_satabot_v2/features/devices/data/repositories/generate_path_repository_Impl.dart';
import 'package:maibu_satabot_v2/features/devices/domain/usecases/get_work_record_usecase.dart'; import 'package:maibu_satabot_v2/features/devices/domain/usecases/get_work_record_usecase.dart';
@@ -1091,6 +1092,7 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
// 4. 获取生成结果并处理 // 4. 获取生成结果并处理
final cubitState = context.read<DevicesCubit>().state; final cubitState = context.read<DevicesCubit>().state;
print('${cubitState.generatedPath},路径生成结果');
if (cubitState.errorMessage != null) { if (cubitState.errorMessage != null) {
// 生成失败 // 生成失败
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('路径生成失败:${cubitState.errorMessage}'), backgroundColor: Colors.red)); ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('路径生成失败:${cubitState.errorMessage}'), backgroundColor: Colors.red));
@@ -1100,21 +1102,22 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
debugPrint('生成的路径数据:${cubitState.generatedPath}'); debugPrint('生成的路径数据:${cubitState.generatedPath}');
// 可选:将生成的路径转换为地图可显示的坐标(WGS84 → GCJ02) // 可选:将生成的路径转换为地图可显示的坐标(WGS84 → GCJ02)
if (cubitState.generatedPath is List) { if (cubitState.generatedPath is List) {
setState(() { setState(() {
// 关键:生成的路径是 WGS84,需转回 GCJ02 才能在高德地图正确显示 // 先将 List<dynamic> 转换为 List<DeviceAddPathPointModel>
gcjPathPoints = (cubitState.generatedPath as List).map((point) { final pathList = cubitState.generatedPath as List;
// 先取 WGS84 坐标 final typedPathList = pathList.whereType<work_area_model.DeviceAddPathPointModel>().toList();
double wgs84Lat = safeToDouble(point['lat']) ?? 0.0;
double wgs84Lon = safeToDouble(point['lon']) ?? 0.0; // 然后使用 .lat 和 .lon 属性访问
// 转换为 GCJ02 gcjPathPoints = typedPathList.map((point) {
double wgs84Lat = point.latitude;
double wgs84Lon = point.longitude;
final gcjPoint = wgs84ToGcj02(wgs84Lat, wgs84Lon); final gcjPoint = wgs84ToGcj02(wgs84Lat, wgs84Lon);
return LatLng(gcjPoint.latitude, gcjPoint.longitude); return LatLng(gcjPoint.latitude, gcjPoint.longitude);
}).toList(); }).toList();
// 外边界也转回 GCJ02 显示(可选,保持和地图坐标系一致)
gcjOuterPoints = _markedPoints; gcjOuterPoints = _markedPoints;
}); });
// 移动地图到生成的路径中心
moveMapToPointsCenter(gcjPathPoints); moveMapToPointsCenter(gcjPathPoints);
} }
} }