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-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() { 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; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/OrderBasicInfoApiImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/OrderBasicInfoApiImpl.java index c3feb6533..ada1628b3 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/OrderBasicInfoApiImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/OrderBasicInfoApiImpl.java @@ -105,5 +105,10 @@ public class OrderBasicInfoApiImpl implements OrderBasicInfoApi { return orderBasicInfoService.tempGetOrderCodes(queryOrderDTO); } + @Override + public OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode) { + return null; + } + } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/PileStationInfoApiImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/PileStationInfoApiImpl.java index d7a2e6d95..8ab161953 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/PileStationInfoApiImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/PileStationInfoApiImpl.java @@ -4,6 +4,7 @@ import com.jsowell.common.service.thirdparty.domin.PileStationInfo; import com.jsowell.common.service.thirdparty.dto.QueryStationInfoDTO; import com.jsowell.common.service.thirdparty.tempservice.PileStationInfoApi; +import com.jsowell.common.service.thirdparty.vo.PileStationVO; import com.jsowell.common.service.thirdparty.vo.ThirdPartyStationInfoVO; import com.jsowell.pile.service.PileStationInfoService; @@ -51,4 +52,14 @@ public class PileStationInfoApiImpl implements PileStationInfoApi { return result; } + @Override + public PileStationVO getStationInfoByPileConnectorCode(String pileConnectorCode) { + return null; + } + + @Override + public PileStationVO getStationInfo(String stationId) { + return null; + } + } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/ThirdpartySecretInfoApiImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/ThirdpartySecretInfoApiImpl.java index dc9979659..5e95fe11f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/ThirdpartySecretInfoApiImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/dubbo/api/impl/ThirdpartySecretInfoApiImpl.java @@ -8,6 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Collections; import java.util.List; @DubboService(group = "thirdparty", version = "1.0.0") @@ -68,4 +69,9 @@ public class ThirdpartySecretInfoApiImpl implements ThirdpartySecretInfoApi { } return stationInfoVOList; } + + @Override + public List queryStationToPlatformList(String stationId) { + return Collections.emptyList(); + } }