From 951f90b82993acc835cdf58a9f1f39aeecd86674 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 16:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 78850fe..18ce72b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -477,10 +477,10 @@
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
- map.put("space_id",site.getStoreId().toString());
+ map.put("space_id",store.getId().toString());
map.put("area_id",integer1.toString());
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
-
+ String s = HttpRequestUtil.postRequest
+ ("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
// 添加门禁
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
@@ -489,19 +489,15 @@
for (String s1 : site.getIds().split(",")) {
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id", site.getStoreId() + "");
+ map1.put("space_id", store.getId().toString() + "");
map1.put("device_id", s1);
map1.put("region_id", integer1 + "");
String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
System.out.println("添加闸机：" + s2);
}
}
-
-
return ResultUtil.success("添加成功");
}
-
-
/**
* 编辑场地管理
*/
@@ -545,16 +541,14 @@
for (String s : site.getIds().split(",")) {
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id", store.getId() + "");
+ map1.put("space_id", site.getId() + "");
map1.put("device_id", s);
- map1.put("region_id", site.getId() + "");
+ map1.put("region_id", store.getId() + "");
// 添加门禁
String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
System.out.println(s1);
}
}
-
-
return ResultUtil.success();
}
--
Gitblit v1.7.1