From 51e30a5f25ed53c9c65aa177f4869e4bcb8f6d55 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 四月 2025 09:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
index 5ee6087..1894f2a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java
@@ -293,7 +293,8 @@
 		for (Site datum : sites) {
 			StationInfo stationInfo = new StationInfo();
 			stationInfo.setStationUniqueNumber(datum.getCode());
-			stationInfo.setAreaCodeCountryside(datum.getCountryCode());
+			stationInfo.setAreaCodeCountryside(datum.getDistrictsCode());
+			stationInfo.setAreaCode((Integer.parseInt(datum.getCityCode())+1)+"");
 			stationInfo.setStationClassification(datum.getStationClassification());
 			stationInfo.setGeneralApplicationType(datum.getGeneralApplicationType());
 			if (org.springframework.util.StringUtils.hasLength(datum.getSwapMatchCars())){
@@ -340,7 +341,6 @@
 			stationInfo.setEquipmentOwnerID("906171535");
 			stationInfo.setStationName(datum.getName());
 			stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
-			stationInfo.setAreaCode(datum.getDistrictsCode());
 			stationInfo.setAddress(datum.getAddress());
 			stationInfo.setStationTel(datum.getPhone());
 			stationInfo.setServiceTel(serviceTel);

--
Gitblit v1.7.1