From 4b457ef1a8a2de2172b37e0f33a1ec3a677d76a1 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Sat, 17 Feb 2024 14:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=94=B5=E6=B1=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E9=99=A4https?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/apps/service/impl/EquipmentServiceImpl.java   | 6 ++++--
 .../gxwebsoft/open/controller/OpenEquipmentController.java  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
index 61f41db..88616a1 100644
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
@@ -58,8 +58,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         // 查询绑定电池的用户
         for (Equipment equipment : list) {
             // 查询状态
+            System.out.println("equipment.getEquipmentCode() = " + equipment.getEquipmentCode());
             try {
-                ResponseEntity<JSONObject> entity = restTemplate.getForEntity("https://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
+                ResponseEntity<JSONObject> entity = restTemplate.getForEntity("http://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
                 JSONObject body = entity.getBody();
                 Integer code = body.getInteger("code");
                 JSONObject data = body.getJSONObject("data");
@@ -111,8 +112,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         EquipmentParam param = new EquipmentParam();
         param.setEquipmentId(equipmentId);
         Equipment equipment = baseMapper.selectListRel(param).get(0);
+        System.out.println("equipment.getEquipmentCode2() = " + equipment.getEquipmentCode());
         try {
-            ResponseEntity<JSONObject> entity = restTemplate.getForEntity("https://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
+            ResponseEntity<JSONObject> entity = restTemplate.getForEntity("http://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
             JSONObject body = entity.getBody();
             Integer code = body.getInteger("code");
             JSONObject data = body.getJSONObject("data");
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
index fb9d51b..5cf2fc7 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
@@ -272,8 +272,9 @@ public class OpenEquipmentController extends BaseController {
             param.put("userName", loginUser.getNickname());
             param.put("userPhone", loginUser.getPhone());
             param.put("battery_sn", one.getEquipmentCode());
+            System.out.println("param = " + param);
             try {
-                ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("https://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
+                ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("http://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
                 JSONObject body = responseEntity.getBody();
                 log.info("电池绑定调用第三方返回：{}", body.toString());
             }catch (Exception e) {
@@ -376,7 +377,8 @@ public class OpenEquipmentController extends BaseController {
             param.put("userName", loginUser.getNickname());
             param.put("userPhone", loginUser.getPhone());
             param.put("battery_sn", one.getEquipmentCode());
-            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("https://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
+            System.out.println("param2 = " + param);
+            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("http://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
             JSONObject body = responseEntity.getBody();
             log.info("电池更换调用第三方返回：{}", body);
             return success("换电成功");