gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第三方电池接口去除https

Browse Source
This commit is contained in:
gxwebsoft
2024-02-17 14:45:18 +08:00
parent 5a5e4b7499
commit 4b457ef1a8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
View File

@@ -58,8 +58,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
// 查询绑定电池的用户 // 查询绑定电池的用户
for (Equipment equipment : list) { for (Equipment equipment : list) {
// 查询状态 // 查询状态
System.out.println("equipment.getEquipmentCode() = " + equipment.getEquipmentCode());
try { 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(); JSONObject body = entity.getBody();
Integer code = body.getInteger("code"); Integer code = body.getInteger("code");
JSONObject data = body.getJSONObject("data"); JSONObject data = body.getJSONObject("data");
@@ -111,8 +112,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
EquipmentParam param = new EquipmentParam(); EquipmentParam param = new EquipmentParam();
param.setEquipmentId(equipmentId); param.setEquipmentId(equipmentId);
Equipment equipment = baseMapper.selectListRel(param).get(0); Equipment equipment = baseMapper.selectListRel(param).get(0);
System.out.println("equipment.getEquipmentCode2() = " + equipment.getEquipmentCode());
try { 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(); JSONObject body = entity.getBody();
Integer code = body.getInteger("code"); Integer code = body.getInteger("code");
JSONObject data = body.getJSONObject("data"); JSONObject data = body.getJSONObject("data");

6
src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
View File

@@ -272,8 +272,9 @@ public class OpenEquipmentController extends BaseController {
param.put("userName", loginUser.getNickname()); param.put("userName", loginUser.getNickname());
param.put("userPhone", loginUser.getPhone()); param.put("userPhone", loginUser.getPhone());
param.put("battery_sn", one.getEquipmentCode()); param.put("battery_sn", one.getEquipmentCode());
System.out.println("param = " + param);
try { 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(); JSONObject body = responseEntity.getBody();
log.info("电池绑定调用第三方返回：{}", body.toString()); log.info("电池绑定调用第三方返回：{}", body.toString());
}catch (Exception e) { }catch (Exception e) {
@@ -376,7 +377,8 @@ public class OpenEquipmentController extends BaseController {
param.put("userName", loginUser.getNickname()); param.put("userName", loginUser.getNickname());
param.put("userPhone", loginUser.getPhone()); param.put("userPhone", loginUser.getPhone());
param.put("battery_sn", one.getEquipmentCode()); 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(); JSONObject body = responseEntity.getBody();
log.info("电池更换调用第三方返回：{}", body); log.info("电池更换调用第三方返回：{}", body);
return success("换电成功"); return success("换电成功");