From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java |   22 ++++++++++------------
 1 files changed, 10 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 f1ac631..5544936 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
@@ -474,35 +474,31 @@
         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",site.getStoreId().toString());
-        map.put("area_id",integer1.toString());
-        String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
-
+        map.put("space_id",integer1.toString());
+        map.put("area_id",store.getId().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 spaceId = data.getString("space_id");
 //        Integer integer = Integer.valueOf(spaceId);
         if(StringUtils.hasLength( site.getIds())) {
             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", integer1 + "");
                 map1.put("device_id", s1);
-                map1.put("region_id", integer1 + "");
+                map1.put("region_id", store.getId().toString() + "");
                 String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
                 System.out.println("添加闸机:" + s2);
             }
         }
-
-
         return ResultUtil.success("添加成功");
     }
-
-
     /**
      *  编辑场地管理
      */
@@ -714,7 +710,9 @@
     @ResponseBody
     public Object getChangeOne(Integer oneId) {
         try {
-            return storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId,oneId).eq(TStore::getState,1));
+            return storeService.list(new QueryWrapper<TStore>()
+                    .eq("operatorId",oneId)
+                    .eq("state",1));
         }catch (Exception e){
             e.printStackTrace();
             return ERROR;

--
Gitblit v1.7.1