联调修改结构

ln_jq_app/lib/pages/c_page/mine/controller.dart

@@ -16,7 +16,6 @@ class MineController extends GetxController with BaseControllerMixin {
   void onInit() {
     super.onInit();
     renderData();
-    renderViolation();
   }
 
   @override
@@ -51,9 +50,8 @@ class MineController extends GetxController with BaseControllerMixin {
       plateNumber = bean.plateNumber;
     }
 
-    showLoading("加载中");
-
     try {
+      showLoading("加载中");
       await Future.wait([
         _fetchCompletionRate(), // 请求1：完成率
         _fetchAccidentCount(), // 请求2：事故数
@@ -61,6 +59,8 @@ class MineController extends GetxController with BaseControllerMixin {
         _rating(), // 司机评分
         _msgNotice(), // 红点消息
       ]);
+
+      await renderViolation();
     } catch (e, stackTrace) {
       showErrorToast("加载数据失败，请稍后重试 $e");
     } finally {
@@ -83,8 +83,8 @@ class MineController extends GetxController with BaseControllerMixin {
     if (response != null) {
       final result = BaseModel.fromJson(response.data);
       if (result.code == 0 && result.data != null) {
-        int total = result.data["total"] ?? 0;
-        isNotice = total > 0;
+        String total = result.data["total"].toString();
+        isNotice = int.parse(total) > 0;
       }
     }
   }
@@ -139,15 +139,11 @@ class MineController extends GetxController with BaseControllerMixin {
     }
   }
 
-  void renderViolation() async {
+  Future<void> renderViolation() async {
     // 违章信息查询
-    final originalHeaders = Map<String, dynamic>.from(HttpService.to.dio.options.headers);
     try {
-      HttpService.to.setBaseUrl(AppTheme.jiaqing_service_url);
-      HttpService.to.dio.options.headers['appId'] = '97ad10eeb6b346f79e0d6ffd81e4d3c3';
-
       var responseData = await HttpService.to.get(
-        "vehicleService/violation/queryViolationInfo_V2?plateNum=${plateNumber}",
+        "appointment/truck/queryViolationInfo_V2?plateNum=${plateNumber}",
       );
 
       if (responseData == null || responseData.data == null) {
@@ -174,8 +170,6 @@ class MineController extends GetxController with BaseControllerMixin {
       }
     } catch (e) {
     } finally {
-      HttpService.to.setBaseUrl(AppTheme.test_service_url);
-      HttpService.to.dio.options.headers = originalHeaders;
       updateUi();
     }
   }

ln_jq_app/lib/pages/c_page/reservation/controller.dart

@@ -185,8 +185,8 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
     final now = DateTime.now();
     final isToday =
         selectedDate.value.year == now.year &&
-            selectedDate.value.month == now.month &&
-            selectedDate.value.day == now.day;
+        selectedDate.value.month == now.month &&
+        selectedDate.value.day == now.day;
 
     final List<TimeSlot> availableSlots = [];
     for (int i = 0; i < 24; i++) {
@@ -234,7 +234,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
 
     // 查找当前选中的时间对应的新列表中的索引
     int initialItem = availableSlots.indexWhere(
-          (slot) => slot.start.hour == startTime.value.hour,
+      (slot) => slot.start.hour == startTime.value.hour,
     );
 
     if (initialItem == -1) {
@@ -393,17 +393,16 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
           'hydAmount': ampuntStr,
         },
       );
-
       var result = BaseModel.fromJson(responseData?.data);
 
-      if (responseData == null) {
+
+      if (responseData == null || result.code != 0) {
         dismissLoading();
         showToast(result.error);
         return;
       }
       dismissLoading();
 
-
       if (result.code == 0) {
         showSuccessToast("预约成功");
 
@@ -438,7 +437,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       }
     } catch (e) {
       dismissLoading();
-      showToast('服务暂不可用，请稍后');
     }
   }
 
@@ -527,6 +525,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
         reservationList.clear();
       }
     } catch (e) {
+      Logger.d("${e.toString()}");
       showToast('获取预约数据失败');
       hasReservationData.value = false;
       reservationList.clear();
@@ -593,7 +592,7 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       plateNumber = bean.plateNumber;
       vin = bean.vin;
       plateNumberController = TextEditingController(text: plateNumber);
-      maxHydrogen = bean.maxHydrogen;
+      maxHydrogen = num.tryParse(bean.maxHydrogen) ?? 0;
       getCatinfo();
       getJqinfo();
     }
@@ -689,13 +688,10 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       return;
     }
 
-    showLoading("加氢站数据加载中");
-    final originalHeaders = Map<String, dynamic>.from(HttpService.to.dio.options.headers);
     try {
-      HttpService.to.setBaseUrl(AppTheme.jiaqing_service_url);
-      HttpService.to.dio.options.headers['appId'] = '97ad10eeb6b346f79e0d6ffd81e4d3c3';
+      showLoading("加氢站数据加载中");
 
-      var responseData = await HttpService.to.get("hydrogen/queryHydrogenSiteInfo");
+      var responseData = await HttpService.to.get("appointment/station/queryHydrogenSiteInfo");
 
       if (responseData == null || responseData.data == null) {
         showToast('暂时无法获取站点信息');
@@ -744,9 +740,6 @@ class C_ReservationController extends GetxController with BaseControllerMixin {
       showToast('数据异常');
     } finally {
       dismissLoading();
-      HttpService.to.setBaseUrl(AppTheme.test_service_url);
-      HttpService.to.dio.options.headers = originalHeaders;
-
       // 如果未绑定车辆，且本次会话尚未提示过，则弹出提示
       if (!StorageService.to.hasShownBindVehicleDialog &&
           StorageService.to.isLoggedIn &&