From d31920a1233ab14cdd5e33756bb1b0e3ed235e66 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期三, 08 九月 2021 12:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java b/service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java
old mode 100644
new mode 100755
index 8883394..c4c5ecd
--- a/service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java
+++ b/service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java
@@ -17,8 +17,11 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.client.RestTemplate;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
 import com.java110.entity.order.Business;
 import com.java110.job.adapt.hcIot.GetToken;
+import com.java110.po.machine.MachineRecordPo;
 import com.java110.vo.ResultVo;
 import org.springframework.http.HttpHeaders;
 
@@ -36,7 +39,7 @@
      */
     protected HttpHeaders getHeaders(RestTemplate outRestTemplate) {
         HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add("access_token", GetToken.get(outRestTemplate,false));
+        httpHeaders.add("access_token", GetToken.get(outRestTemplate, false));
         //httpHeaders.add("Content-Type", "application/x-www-form-urlencoded");
         return httpHeaders;
     }
@@ -53,6 +56,11 @@
         return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
     }
 
+    @Override
+    public ResultVo getQRcode(JSONObject reqJson) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
     /**
      * 閲嶅惎璁惧
      *
@@ -65,13 +73,54 @@
     }
 
     /**
+     * 澶辫触閲嶆柊閫両OT
+     *
+     * @param paramIn
+     * @return
+     */
+    @Override
+    public ResultVo reSendToIot(JSONObject paramIn) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+    /**
+     * 鏌ヨ 涓存椂杞﹀緟鏀粯璁㈠崟
+     *
+     * @param tempCarPayOrderDto
+     * @return
+     */
+    @Override
+    public ResultVo getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+    /**
+     * 鏌ヨ 涓存椂杞﹀緟鏀粯璁㈠崟
+     *
+     * @param tempCarPayOrderDto
+     * @return
+     */
+    @Override
+    public ResultVo notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
+        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+    }
+
+
+    /**
      * 涓氫富澶勭悊鎵ц
      *
      * @param business   褰撳墠澶勭悊涓氬姟
      * @param businesses 鎵�鏈変笟鍔′俊鎭�
      */
     @Override
-    public void execute(Business business, List<Business> businesses) {
+    public void execute(Business business, List<Business> businesses) throws Exception {
+
+    }
+    /**
+     * 鎵嬪伐 閫佹暟鎹�
+     * @param customBusinessDatabusDto
+     */
+    public void customExchange(CustomBusinessDatabusDto customBusinessDatabusDto){
 
     }
 }

--
Gitblit v1.8.0