From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 31a6afe..90d491e 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.addSite(site);
 //        Integer integer = Integer.valueOf(spaceId);
         if(StringUtils.hasLength( site.getIds())) {
             for (String s1 : site.getIds().split(",")) {

--
Gitblit v1.7.1