From 66fe563a04f1e99088cc343e1c2ffb139e6dfa1f Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 11 Aug 2025 10:08:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bugfix=20=E7=94=9F=E6=88=90=E6=A1=A9?= =?UTF-8?q?=E5=8F=B7=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/PileService.java | 2 +- .../com/jsowell/common/enums/SoftwareProtocolEnum.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index d7da64f0f..039751151 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -119,7 +119,7 @@ public class PileService { List snList = null; if (StringUtils.equals(SoftwareProtocolEnum.YOU_DIAN.getValue(), softwareProtocol)) { snList = snUtils.generateEBikeSN(dto.getNum()); - } else if (StringUtils.equals(SoftwareProtocolEnum.YUN_KUAI_CHONG.getValue(), softwareProtocol)){ + } else if (StringUtils.equals(SoftwareProtocolEnum.YUN_KUAI_CHONGV150.getValue(), softwareProtocol)){ snList = snUtils.generateEVPileSN(dto.getNum()); } else { throw new BusinessException(ReturnCodeEnum.valueOf("软件协议不正确")); diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/SoftwareProtocolEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/SoftwareProtocolEnum.java index d5344590a..1945d7c64 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/SoftwareProtocolEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/SoftwareProtocolEnum.java @@ -4,9 +4,10 @@ package com.jsowell.common.enums; * 软件协议enum */ public enum SoftwareProtocolEnum { - YUN_KUAI_CHONG("1", "云快充"), - YONG_LIAN("2", "永联"), - YOU_DIAN("3", "友电"), + YUN_KUAI_CHONGV150("yunkuaichongV150", "云快充V1.5"), + YUN_KUAI_CHONGV160("yunkuaichongV160", "云快充V1.6"), + YONG_LIAN("yonglianV1", "永联"), + YOU_DIAN("youdianV1", "友电"), ; private String value; From 247f55f62feb1b947f1f0260d561a8fa387028e6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 11 Aug 2025 15:46:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E6=B3=A8=E5=86=8C=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 10 +++++----- .../src/main/resources/application-sit.yml | 10 +++++----- .../common/config/mq/DirectRabbitConfig.java | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index fd5346e4e..7f319657c 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -9,7 +9,7 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.8.2 + host: 192.168.0.32 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -36,7 +36,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.8.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jsowell_dev # url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: jsowell_prd_copy @@ -90,7 +90,7 @@ spring: # rabbitmq配置 dev rabbitmq: - host: 192.168.8.2 + host: 192.168.0.32 port: 5672 username: admin password: admin @@ -259,13 +259,13 @@ dubbo: name: wcc-server qosEnable: false registry: - address: nacos://192.168.8.2:8848 + address: nacos://192.168.0.32:8848 parameters: namespace: e328faaf-8516-42d0-817a-7406232b3581 username: nacos password: 79HMu!6nlOiLm^Q[ protocol: name: dubbo - port: 20880 + port: -1 consumer: check: false # 关键配置：启动时不检查提供者 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index aa713d8cd..b7767686a 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -8,7 +8,7 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.8.2 + host: 192.168.0.32 # 端口，默认为6379 port: 6379 # 数据库索引 @@ -35,9 +35,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.8.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jsowell_dev -# url: jdbc:mysql://192.168.8.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.168.0.32:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: jsowell_prd_copy password: 123456 # 从库数据源 @@ -89,7 +89,7 @@ spring: # rabbitmq配置 sit rabbitmq: - host: 192.168.8.2 + host: 192.168.0.32 port: 5672 username: admin password: admin @@ -257,7 +257,7 @@ dubbo: name: wcc-server qosEnable: false registry: - address: nacos://192.168.8.2:8848 + address: nacos://192.168.0.32:8848 parameters: namespace: e328faaf-8516-42d0-817a-7406232b3581 username: nacos diff --git a/jsowell-common/src/main/java/com/jsowell/common/config/mq/DirectRabbitConfig.java b/jsowell-common/src/main/java/com/jsowell/common/config/mq/DirectRabbitConfig.java index a865855ee..72fa9643d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/config/mq/DirectRabbitConfig.java +++ b/jsowell-common/src/main/java/com/jsowell/common/config/mq/DirectRabbitConfig.java @@ -35,10 +35,10 @@ public class DirectRabbitConfig { // return new Queue(RabbitConstants.QUEUE_HEART_BEAT); // } // - // @Bean - // public Queue realtimeDataQueue() { - // return new Queue(RabbitConstants.QUEUE_REALTIME_DATA); - // } + @Bean + public Queue realtimeDataQueue() { + return new Queue(RabbitConstants.QUEUE_REALTIME_DATA); + } // // @Bean // public Queue priceSenderQueue() { @@ -88,10 +88,10 @@ public class DirectRabbitConfig { // return BindingBuilder.bind(heartBeatQueue()).to(exchange()).with(RabbitConstants.QUEUE_HEART_BEAT); // } // - // @Bean - // public Binding bindRealtimeData() { - // return BindingBuilder.bind(realtimeDataQueue()).to(exchange()).with(RabbitConstants.QUEUE_REALTIME_DATA); - // } + @Bean + public Binding bindRealtimeData() { + return BindingBuilder.bind(realtimeDataQueue()).to(exchange()).with(RabbitConstants.QUEUE_REALTIME_DATA); + } // // @Bean // public Binding bindPriceSender() {