From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 826c55e..afe92a2 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
@@ -472,19 +472,22 @@
site.setInsertTime(new Date());
site.setState(1);
site.setOperatorId(UserExt.getUser().getObjectId());
- Integer integer1 = siteClient.addSite(site);
+
// 添加场地
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("name",site.getName());
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);
// 添加门禁
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
+ String area_id = data.getString("area_id");
+ Integer integer = Integer.valueOf(area_id);
+ site.setId(integer);
+ Integer integer1 = siteClient.addSite1(site);
// Integer integer = Integer.valueOf(spaceId);
if(StringUtils.hasLength( site.getIds())) {
for (String s1 : site.getIds().split(",")) {
@@ -542,15 +545,17 @@
for (String s : site.getIds().split(",")) {
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id", site.getId() + "");
+ map1.put("space_id", store.getId() + "");
map1.put("device_id", s);
- map1.put("region_id", store.getId() + "");
+ map1.put("region_id", site.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