From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java
index 79efc97..de89478 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java
@@ -17,25 +17,15 @@
import com.java110.common.charge.IChargeCore;
-import com.java110.common.smartMeter.ISmartMeterFactoryAdapt;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.chargeMachine.ChargeMachineDto;
-import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
-import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto;
-import com.java110.dto.meterWater.NotifyMeterWaterOrderDto;
+import com.java110.dto.chargeMachine.NotifyChargeOrderDto;
import com.java110.intf.common.*;
-import com.java110.utils.exception.CmdException;
-import com.java110.utils.factory.ApplicationContextFactory;
-import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
/**
* 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｅ疄鐜扮被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
@@ -51,25 +41,28 @@
private static final Logger logger = LoggerFactory.getLogger(NotifyChargeV1InnerServiceSMOImpl.class);
-
@Autowired
private IChargeCore chargeCoreImpl;
@Override
- public ResponseEntity<String> finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
+ public ResultVo finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
- return chargeCoreImpl.finishCharge(notifyChargeOrderDto);
-
+ ResultVo resultVo = null;
+ try {
+ resultVo = chargeCoreImpl.finishCharge(notifyChargeOrderDto);
+ } catch (Exception e) {
+ e.printStackTrace();
+ logger.error("鍋滄鍏呯數澶辫触", e);
+ throw e;
+ }
+ return resultVo;
}
@Override
- public ResponseEntity<String> heartbeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
- return chargeCoreImpl.heartbeat(notifyChargeOrderDto);
+ public ResultVo workHeartbeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
+ return chargeCoreImpl.workHeartbeat(notifyChargeOrderDto);
}
- @Override
- public ResponseEntity<String> chargeHeartBeat(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
- return chargeCoreImpl.chargeHeartBeat(notifyChargeOrderDto);
- }
+
}
--
Gitblit v1.8.0