From 7d1da567f0ba92f48c6e7361466ee2e0724339fb Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 16 Jun 2025 16:59:22 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=95=B4=E5=90=88dubbo3.3.0,=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8nacos2.0.3=E4=BD=9C=E4=B8=BA=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83,=20=E5=8D=87=E7=BA=A7fastjson=202.0.11->2.0.?= =?UTF-8?q?23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/pom.xml | 21 ++++++- .../java/com/jsowell/JsowellApplication.java | 2 + .../src/main/resources/application.yml | 13 ++++ pom.xml | 62 +++++++++++++++++-- 4 files changed, 92 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml index 052d409ea..f50a9c149 100644 --- a/jsowell-admin/pom.xml +++ b/jsowell-admin/pom.xml @@ -113,6 +113,25 @@ test + + com.jsowell + charge-common-api + + + + org.apache.commons + commons-lang3 + + + + org.apache.dubbo + dubbo + + + org.apache.dubbo + dubbo-registry-nacos + + @@ -158,4 +177,4 @@ ${project.artifactId} - \ No newline at end of file + diff --git a/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java b/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java index 5acc5cce4..80ae93391 100644 --- a/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java +++ b/jsowell-admin/src/main/java/com/jsowell/JsowellApplication.java @@ -1,5 +1,6 @@ package com.jsowell; +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -11,6 +12,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@EnableDubbo public class JsowellApplication { public static void main(String[] args) { diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index d2f6547e7..b0dd33f94 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -71,6 +71,19 @@ spring: # 热部署开关 enabled: true +# dubbo配置 +dubbo: + application: + name: jsowell-service + qosEnable: false + registry: + address: nacos://192.168.2.2:8848 + username: nacos + password: nacos + protocol: + name: dubbo + port: -1 + # MyBatis配置 mybatis: # 搜索指定包别名 diff --git a/pom.xml b/pom.xml index 034b5ccc7..0ba5adf88 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + com.jsowell jsowell-charger-web 1.0.0 jsowell 万车充运营管理平台 - + 1.0.0 UTF-8 @@ -23,7 +23,8 @@ 2.3.2 2.2.2 1.4.3 - 2.0.11 + + 2.0.23 6.2.2 2.11.0 1.4 @@ -42,8 +43,11 @@ 2.2.3 3.1.87 1.8.0 + + 3.3.0 + 2.0.3 - + @@ -336,6 +340,54 @@ ${protostuff.version} + + com.jsowell + charge-common-api + 1.0.0 + + + + + org.apache.dubbo + dubbo-dependencies-bom + ${dubbo.version} + pom + import + + + org.apache.dubbo + dubbo-spring-boot-starter + ${dubbo.version} + + + org.apache.dubbo + dubbo-registry-nacos + ${dubbo.version} + + + org.apache.dubbo + dubbo + ${dubbo.version} + + + org.springframework + spring + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + @@ -395,4 +447,4 @@ - \ No newline at end of file + From 906ef49dc450ea863d7dfa3e30ef9dae4df7b3f1 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 08:34:49 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9dubbo=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index b0dd33f94..8eaf48d4c 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -78,11 +78,13 @@ dubbo: qosEnable: false registry: address: nacos://192.168.2.2:8848 + parameters: + namespace: e328faaf-8516-42d0-817a-7406232b3581 username: nacos password: nacos protocol: name: dubbo - port: -1 + port: 20880 # MyBatis配置 mybatis: From 04c3436c052558d1eef576202f8ed5d2d96e408d Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 09:13:53 +0800 Subject: [PATCH 03/12] =?UTF-8?q?update=20dubbo=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml index f50a9c149..c5448c385 100644 --- a/jsowell-admin/pom.xml +++ b/jsowell-admin/pom.xml @@ -127,10 +127,6 @@ org.apache.dubbo dubbo - - org.apache.dubbo - dubbo-registry-nacos - From e470d4bedee348014f2722d31977935cfcac67f2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 09:59:05 +0800 Subject: [PATCH 04/12] =?UTF-8?q?Revert=20"update=20dubbo=E4=BE=9D?= =?UTF-8?q?=E8=B5=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 04c3436c052558d1eef576202f8ed5d2d96e408d. --- jsowell-admin/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml index c5448c385..f50a9c149 100644 --- a/jsowell-admin/pom.xml +++ b/jsowell-admin/pom.xml @@ -127,6 +127,10 @@ org.apache.dubbo dubbo + + org.apache.dubbo + dubbo-registry-nacos + From 4d5c4b866e5901a918c2ad2a147099c9e0c62da1 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 15:08:03 +0800 Subject: [PATCH 05/12] add dubbo service --- .../test/java/SpringBootTestController.java | 11 +++++++ jsowell-pile/pom.xml | 11 ++++++- .../java/com/jsowell/dubbo/JCPPService.java | 30 +++++++++++++++++++ .../impl/PileBillingTemplateServiceImpl.java | 1 + .../pile/vo/web/BillingTemplateVO.java | 1 + pom.xml | 2 +- 6 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 31c6214e3..ae890db54 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -41,6 +41,7 @@ import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.service.ProtocolService; import com.jsowell.common.util.*; import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; import com.jsowell.common.util.http.HttpUtils; @@ -94,6 +95,7 @@ import com.jsowell.wxpay.response.WechatPayRefundRequest; import com.jsowell.wxpay.service.WxAppletRemoteService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -292,6 +294,15 @@ public class SpringBootTestController { @Autowired private QcyunsService qcyunsService; + @DubboReference + private ProtocolService protocolService; + + @Test + public void testDubbo() { + String s = protocolService.sayHello("jsowell-charger-web"); + System.out.println(s); + } + @Test public void testCommonVerificationCode() { String phoneNumber = "18612341234"; diff --git a/jsowell-pile/pom.xml b/jsowell-pile/pom.xml index 201064808..c4ee39f54 100644 --- a/jsowell-pile/pom.xml +++ b/jsowell-pile/pom.xml @@ -156,6 +156,15 @@ + + org.apache.dubbo + dubbo + + + + com.jsowell + charge-common-api + @@ -182,4 +191,4 @@ - \ No newline at end of file + diff --git a/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java b/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java new file mode 100644 index 000000000..23b4e61ac --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java @@ -0,0 +1,30 @@ +package com.jsowell.dubbo; + +import com.jsowell.common.service.ProtocolService; +import org.apache.dubbo.config.annotation.DubboReference; + +import java.math.BigDecimal; + +public class JCPPService { + + @DubboReference + ProtocolService protocolService; + + /** + * 调用jcpp的下发计费模板 + */ + + /** + * 调用jcpp的启动充电 + */ + public void startCharge(String pileCode, String gunCode, BigDecimal limitYuan, String orderNo) { + protocolService.startCharge(pileCode, gunCode, limitYuan, orderNo); + } + + /** + * 调用jcpp的停止充电 + */ + public void stopCharge(String pileCode, String gunCode, String orderNo) { + // protocolService.stopCharge(pileCode, gunCode, orderNo); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 42cc30092..aac2e143e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -849,6 +849,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic } BillingTemplateVO billingTemplateVO = pileBillingTemplateMapper.selectBillingTemplateByPileSn(pileSn); if (billingTemplateVO != null) { + billingTemplateVO.setPileSn(pileSn); redisCache.setCacheObject(redisKey, JSON.toJSONString(billingTemplateVO), CacheConstants.cache_expire_time_1d); } return billingTemplateVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java index 1d052c769..a0fcf627b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BillingTemplateVO.java @@ -19,6 +19,7 @@ import java.util.Map; @AllArgsConstructor @Builder public class BillingTemplateVO { + private String pileSn; // 站点id private String stationId; diff --git a/pom.xml b/pom.xml index 0ba5adf88..71e585dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -343,7 +343,7 @@ com.jsowell charge-common-api - 1.0.0 + 1.0.1 From dd0ba9a262c502cc0280927a9e4d66081d3a98f6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 15:19:24 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9common=E5=8C=85?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71e585dc9..0ba5adf88 100644 --- a/pom.xml +++ b/pom.xml @@ -343,7 +343,7 @@ com.jsowell charge-common-api - 1.0.1 + 1.0.0 From a949040e782e36a55ee573cccad4c2e166bf68c5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 17 Jun 2025 16:51:50 +0800 Subject: [PATCH 07/12] update dubbo service --- .../com/jsowell/service/YdcServiceImpl.java | 78 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 17 +++- .../src/main/resources/application-prd.yml | 17 +++- .../src/main/resources/application-pre.yml | 15 ++++ .../src/main/resources/application-sit.yml | 15 ++++ .../src/main/resources/application.yml | 15 ---- .../test/java/SpringBootTestController.java | 6 +- .../java/com/jsowell/dubbo/JCPPService.java | 30 ------- .../pile/service/YKCPushCommandService.java | 2 + .../impl/YKCPushCommandServiceImpl.java | 18 ++++- 10 files changed, 162 insertions(+), 51 deletions(-) create mode 100644 jsowell-admin/src/main/java/com/jsowell/service/YdcServiceImpl.java delete mode 100644 jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java diff --git a/jsowell-admin/src/main/java/com/jsowell/service/YdcServiceImpl.java b/jsowell-admin/src/main/java/com/jsowell/service/YdcServiceImpl.java new file mode 100644 index 000000000..9746bdd31 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/service/YdcServiceImpl.java @@ -0,0 +1,78 @@ +package com.jsowell.service; + +import com.jsowell.common.dto.RealTimeMonitorData; +import com.jsowell.common.dto.TransactionRecordsData; +import com.jsowell.common.service.YdcService; +import com.jsowell.common.vo.BillingTemplateVO; +import com.jsowell.common.vo.PileInfoVO; +import org.apache.dubbo.config.annotation.DubboService; + +@DubboService +public class YdcServiceImpl implements YdcService { + @Override + public String sayHello(String name) { + return "hello " + name + " from ydc-server"; + } + + /** + * 查询充电桩详情 + * + * @param pileCode + */ + @Override + public PileInfoVO getPileDetail(String pileCode) { + return null; + } + + /** + * 查询计费模板 + * + * @param pileCode + */ + @Override + public BillingTemplateVO getBillingTemplate(String pileCode) { + return null; + } + + /** + * 启动充电callback + * + * @param pileCode + * @param result + */ + @Override + public void startChargeCallback(String pileCode, String result) { + + } + + /** + * 停止充电callback + * + * @param pileCode + * @param result + */ + @Override + public void stopChargeCallback(String pileCode, String result) { + + } + + /** + * 接收交易记录接口 + * + * @param transactionRecordsData + */ + @Override + public void receiveTradeRecord(TransactionRecordsData transactionRecordsData) { + + } + + /** + * 接收实时监测数据接口 + * + * @param realTimeMonitorData + */ + @Override + public void receiveRealTimeData(RealTimeMonitorData realTimeMonitorData) { + + } +} diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 306a89de8..0d1fd9ade 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -251,4 +251,19 @@ parking: # 充电算法平台配置 chargeAlgorithm: url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json - clientId: e488bac5f70b496fa2d82065089e5f81 \ No newline at end of file + clientId: e488bac5f70b496fa2d82065089e5f81 + +# dubbo配置 +dubbo: + application: + name: ydc-server + qosEnable: false + registry: + address: nacos://192.168.2.2:8848 + parameters: + namespace: e328faaf-8516-42d0-817a-7406232b3581 + username: nacos + password: nacos + protocol: + name: dubbo + port: 20880 diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index ceae04173..8da4e4ab8 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -246,4 +246,19 @@ parking: # 充电算法平台配置 chargeAlgorithm: url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json - clientId: e488bac5f70b496fa2d82065089e5f81 \ No newline at end of file + clientId: e488bac5f70b496fa2d82065089e5f81 + +# dubbo配置 +dubbo: + application: + name: ydc-server + qosEnable: false + registry: + address: nacos://192.168.2.2:8848 + parameters: + namespace: e328faaf-8516-42d0-817a-7406232b3581 + username: nacos + password: nacos + protocol: + name: dubbo + port: 20880 diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 690bbf530..b2669cd20 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -252,3 +252,18 @@ parking: chargeAlgorithm: url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json clientId: e488bac5f70b496fa2d82065089e5f81 + +# dubbo配置 +dubbo: + application: + name: ydc-server + qosEnable: false + registry: + address: nacos://192.168.2.2:8848 + parameters: + namespace: e328faaf-8516-42d0-817a-7406232b3581 + username: nacos + password: nacos + protocol: + name: dubbo + port: 20880 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index b9b0b63c2..788158263 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -250,3 +250,18 @@ parking: chargeAlgorithm: url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json clientId: e488bac5f70b496fa2d82065089e5f81 + +# dubbo配置 +dubbo: + application: + name: ydc-server + qosEnable: false + registry: + address: nacos://192.168.2.2:8848 + parameters: + namespace: e328faaf-8516-42d0-817a-7406232b3581 + username: nacos + password: nacos + protocol: + name: dubbo + port: 20880 diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 8eaf48d4c..d2f6547e7 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/jsowell-admin/src/main/resources/application.yml @@ -71,21 +71,6 @@ spring: # 热部署开关 enabled: true -# dubbo配置 -dubbo: - application: - name: jsowell-service - qosEnable: false - registry: - address: nacos://192.168.2.2:8848 - parameters: - namespace: e328faaf-8516-42d0-817a-7406232b3581 - username: nacos - password: nacos - protocol: - name: dubbo - port: 20880 - # MyBatis配置 mybatis: # 搜索指定包别名 diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index ae890db54..50a3efeb9 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -41,7 +41,7 @@ import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.service.ProtocolService; +import com.jsowell.common.service.JcppService; import com.jsowell.common.util.*; import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; import com.jsowell.common.util.http.HttpUtils; @@ -295,11 +295,11 @@ public class SpringBootTestController { private QcyunsService qcyunsService; @DubboReference - private ProtocolService protocolService; + private JcppService jcppService; @Test public void testDubbo() { - String s = protocolService.sayHello("jsowell-charger-web"); + String s = jcppService.sayHello("jsowell-charger-web"); System.out.println(s); } diff --git a/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java b/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java deleted file mode 100644 index 23b4e61ac..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/dubbo/JCPPService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jsowell.dubbo; - -import com.jsowell.common.service.ProtocolService; -import org.apache.dubbo.config.annotation.DubboReference; - -import java.math.BigDecimal; - -public class JCPPService { - - @DubboReference - ProtocolService protocolService; - - /** - * 调用jcpp的下发计费模板 - */ - - /** - * 调用jcpp的启动充电 - */ - public void startCharge(String pileCode, String gunCode, BigDecimal limitYuan, String orderNo) { - protocolService.startCharge(pileCode, gunCode, limitYuan, orderNo); - } - - /** - * 调用jcpp的停止充电 - */ - public void stopCharge(String pileCode, String gunCode, String orderNo) { - // protocolService.stopCharge(pileCode, gunCode, orderNo); - } -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java index 55612e72a..37c113e10 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java @@ -13,6 +13,8 @@ public interface YKCPushCommandService { */ void pushStartChargingCommand(StartChargingCommand startChargingCommand); + void pushStopChargingCommandForJCPP(StartChargingCommand command); + /** * 发送停止充电指令 * @param stopChargingCommand diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 24aa11377..85d8be731 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -8,6 +8,7 @@ import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.protocol.SyncPromise; +import com.jsowell.common.service.JcppService; import com.jsowell.common.util.*; import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; import com.jsowell.common.util.spring.SpringUtils; @@ -22,6 +23,7 @@ import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Service; @@ -31,7 +33,6 @@ import java.time.LocalTime; import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; /** @@ -56,6 +57,9 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { @Autowired private PileConnectorInfoService pileConnectorInfoService; + @DubboReference + private JcppService jcppService; + // 引入线程池 private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor"); @@ -320,6 +324,18 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { transactionCode, pileSn, BytesUtil.bcd2Str(connectorCodeByteArr), logicCardNum, physicsCardNum, chargeAmount); } + /** + * 连接到jcpp服务的启动充电方法 + */ + @Override + public void pushStopChargingCommandForJCPP(StartChargingCommand command) { + String pileCode = command.getPileSn(); + String gunCode = command.getConnectorCode(); + BigDecimal limitYuan = command.getChargeAmount(); + String orderNo = command.getTransactionCode(); + jcppService.startCharge(pileCode, gunCode, limitYuan, orderNo); + } + /** * 发送停止充电 * From b4ab1ffc8c83154dc9dcc845f36b1f6d797c98a2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 26 Jun 2025 14:46:30 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83nacos=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-dev.yml | 2 +- jsowell-admin/src/main/resources/application-sit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 0d1fd9ade..f3e21a9c7 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -263,7 +263,7 @@ dubbo: parameters: namespace: e328faaf-8516-42d0-817a-7406232b3581 username: nacos - password: nacos + password: 79HMu!6nlOiLm^Q[ protocol: name: dubbo port: 20880 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index 788158263..000ec2065 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -261,7 +261,7 @@ dubbo: parameters: namespace: e328faaf-8516-42d0-817a-7406232b3581 username: nacos - password: nacos + password: 79HMu!6nlOiLm^Q[ protocol: name: dubbo port: 20880 From 2e2ddeb98a27d494f7c2fc383a697cad3458c53e Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 26 Jun 2025 16:34:57 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9dubbo=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-dev.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index f3e21a9c7..8dc8746a2 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -267,3 +267,5 @@ dubbo: protocol: name: dubbo port: 20880 + consumer: + check: false # 关键配置：启动时不检查提供者 From 2d232193438b6c86b72ffb1e452eb843da9a547e Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 11 Jul 2025 14:31:11 +0800 Subject: [PATCH 10/12] =?UTF-8?q?update=20nacos=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-prd.yml | 8 +++++--- jsowell-admin/src/main/resources/application-pre.yml | 8 +++++--- jsowell-admin/src/main/resources/application-sit.yml | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 8da4e4ab8..935f95fde 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -254,11 +254,13 @@ dubbo: name: ydc-server qosEnable: false registry: - address: nacos://192.168.2.2:8848 + address: nacos://47.103.124.69:8848 parameters: - namespace: e328faaf-8516-42d0-817a-7406232b3581 + namespace: 1c0429d3-2842-45a9-b3f3-11605c3fd06e username: nacos - password: nacos + password: 2KaGqRo34B?gH+*p protocol: name: dubbo port: 20880 + consumer: + check: false # 关键配置：启动时不检查提供者 diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index b2669cd20..e6101f330 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -259,11 +259,13 @@ dubbo: name: ydc-server qosEnable: false registry: - address: nacos://192.168.2.2:8848 + address: nacos://106.14.94.149:8848 parameters: - namespace: e328faaf-8516-42d0-817a-7406232b3581 + namespace: 200784c9-7e8f-4b2b-a44f-1eb52e675491 username: nacos - password: nacos + password: 3r?J(Eb0Ka#s5NAm protocol: name: dubbo port: 20880 + consumer: + check: false # 关键配置：启动时不检查提供者 diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index 000ec2065..30a9f5c6b 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -265,3 +265,5 @@ dubbo: protocol: name: dubbo port: 20880 + consumer: + check: false # 关键配置：启动时不检查提供者 From ba680c328e233e9bd29bbe61957237701dcc4cd9 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 11 Jul 2025 16:16:51 +0800 Subject: [PATCH 11/12] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9pre=20nacos?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-pre.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index e6101f330..ef83a13c8 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -263,7 +263,7 @@ dubbo: parameters: namespace: 200784c9-7e8f-4b2b-a44f-1eb52e675491 username: nacos - password: 3r?J(Eb0Ka#s5NAm + password: 3rtJPEb0KaUs5NAm protocol: name: dubbo port: 20880 From 6a1b985efb3b6dafa28c8b7b45bc029057967059 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 11 Jul 2025 16:20:53 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9prd=20nacos=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-prd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 935f95fde..02a653e81 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -258,7 +258,7 @@ dubbo: parameters: namespace: 1c0429d3-2842-45a9-b3f3-11605c3fd06e username: nacos - password: 2KaGqRo34B?gH+*p + password: 2KaGqRo34BHgHJap protocol: name: dubbo port: 20880