From f2e14591d31f144038cfe6abd5ddc453039dc9ae Mon Sep 17 00:00:00 2001
From: "YAS\\29473" <2947326429@qq.com>
Date: Tue, 29 Jul 2025 09:07:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20pre=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-pre.yml    | 22 +++++++++----------
 .../thirdparty/common/CommonService.java      | 11 +++++++++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml
index 793a9ba7f..a970fb4c5 100644
--- a/jsowell-admin/src/main/resources/application-pre.yml
+++ b/jsowell-admin/src/main/resources/application-pre.yml
@@ -8,17 +8,17 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
-#    host: 106.14.94.149
+#    host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
+    host: 106.14.94.149
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 账号
-    username: jsowell
+#    username: jsowell
     # 密码
-    password: js@160829
-#    password: js160829
+#    password: js@160829
+    password: js160829
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -38,12 +38,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jsowell
-        password: js@160829
-#        url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: jsowell_pre
-#        password: Js@160829
+#        url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: jsowell
+#        password: js@160829
+        url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: jsowell_pre
+        password: Js@160829
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
index 2fe8d7939..5a5f5b8b7 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
@@ -438,9 +438,18 @@ public class CommonService {
                 NotificationDTO dto = new NotificationDTO();
                 dto.setStationId(stationId);
                 dto.setPileConnectorCode(pileConnectorCode);
-                dto.setStatus(changedStatus);
                 dto.setPlatformType(thirdPartySecretInfoVO.getPlatformType());
 
+                if(thirdPartySecretInfoVO.getPlatformType().equals(ThirdPlatformTypeEnum.CHANG_ZHOU_PLATFORM.getTypeCode())
+                ){
+                    //无须转换枪口状态
+                    dto.setStatus(connectorStatus);
+                    log.info("枪口状态"+connectorStatus);
+                }else{
+                    dto.setStatus(changedStatus);
+                    log.info("转换的枪口状态"+changedStatus);
+                }
+
                 // 先推送站点状态
                 notificationService.notificationStationStatus(dto);