From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java b/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java
index 344191e..31a2691 100755
--- a/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java
+++ b/java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
-import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
-import com.java110.entity.order.Business;
-import com.java110.po.machine.MachineRecordPo;
+import com.java110.dto.data.DatabusDataDto;
+import com.java110.dto.machine.CarInoutDto;
+import com.java110.dto.machine.MachineDto;
+import com.java110.dto.fee.TempCarPayOrderDto;
+import com.java110.dto.system.Business;
import com.java110.vo.ResultVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +36,13 @@
@RequestMapping(value = "/exchange", method = RequestMethod.POST)
boolean exchange(@RequestBody List<Business> businesses);
+ /**
+ * 鑷畾涔塪atabus 鏁版嵁 浼犺緭
+ * @param databusDataDto
+ * @return
+ */
+ @RequestMapping(value = "/databusData", method = RequestMethod.POST)
+ boolean databusData(@RequestBody DatabusDataDto databusDataDto);
/**
* <p>寮�闂�</p>
@@ -44,6 +52,14 @@
*/
@RequestMapping(value = "/openDoor", method = RequestMethod.POST)
ResultVo openDoor(@RequestBody JSONObject reqJson);
+ /**
+ * <p>寮�闂�</p>
+ *
+ * @param reqJson 璇锋眰淇℃伅
+ * @return TaskDto 瀵硅薄鏁版嵁
+ */
+ @RequestMapping(value = "/closeDoor", method = RequestMethod.POST)
+ ResultVo closeDoor(@RequestBody JSONObject reqJson);
/**
* <p>閲嶅惎璁惧</p>
@@ -76,17 +92,28 @@
ResultVo notifyTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto);
- /**
- * 鑷畾涔塪atabus 鏁版嵁 浼犺緭
- * @param customBusinessDatabusDto
- * @return
- */
- @RequestMapping(value = "/customExchange", method = RequestMethod.POST)
- void customExchange(@RequestBody CustomBusinessDatabusDto customBusinessDatabusDto);
+
@RequestMapping(value = "/getQRcode", method = RequestMethod.POST)
ResultVo getQRcode(@RequestBody JSONObject reqJson);
@RequestMapping(value = "/customCarInOut", method = RequestMethod.POST)
ResultVo customCarInOut(@RequestBody JSONObject reqJson);
+
+ @RequestMapping(value = "/payVideo", method = RequestMethod.POST)
+ ResultVo payVideo(@RequestBody MachineDto machineDto);
+
+ @RequestMapping(value = "/heartbeatVideo", method = RequestMethod.POST)
+ ResultVo heartbeatVideo(@RequestBody JSONObject reqJson);
+ @RequestMapping(value = "/updateCarInoutCarNum", method = RequestMethod.POST)
+ ResultVo updateCarInoutCarNum(@RequestBody CarInoutDto carInoutDto);
+
+ @RequestMapping(value = "/getManualOpenDoorLogs", method = RequestMethod.POST)
+ ResultVo getManualOpenDoorLogs(@RequestBody JSONObject reqJson);
+
+ @RequestMapping(value = "/tempCarAuth", method = RequestMethod.POST)
+ ResultVo tempCarAuth(@RequestBody JSONObject reqJson);
+
+ @RequestMapping(value = "/getTempCarAuths", method = RequestMethod.POST)
+ ResultVo getTempCarAuths(@RequestBody JSONObject reqJson);
}
--
Gitblit v1.8.0