From 3530f728388d91b09a62fbd8f82d3a56b1ff265b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 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 9b1813c..1ff8c53 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
@@ -40,6 +40,7 @@
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.resource.HttpResource;
@@ -482,15 +483,16 @@
JSONObject data = jsonObject.getJSONObject("data");
String spaceId = data.getString("space_id");
// Integer integer = Integer.valueOf(spaceId);
-
- for (String s1 : site.getIds().split(",")) {
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id",site.getStoreId()+"");
- 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);
+ 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("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);
+ }
}
@@ -531,20 +533,23 @@
String ids = byId.getIds();
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- for (String s : ids.split(",")) {
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,map);
- System.out.println(s1);
+ if(StringUtils.hasLength(ids)) {
+ for (String s : ids.split(",")) {
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s, map);
+ System.out.println(s1);
+ }
}
-
- for (String s : site.getIds().split(",")) {
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map1.put("space_id",store.getId()+"");
- map1.put("device_id",s);
- map1.put("region_id",site.getId()+"");
- // 添加门禁
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
- System.out.println(s1);
+ if(StringUtils.hasLength( site.getIds())) {
+ for (String s : site.getIds().split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id", store.getId() + "");
+ map1.put("device_id", s);
+ map1.put("region_id", site.getId() + "");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
}
@@ -611,6 +616,7 @@
@RequestMapping("/add")
public String tCompetitionAdd(Model model) {
List<CityManager> province = cityManagerClient.listAll();
+ System.out.println(province);
// 已有城市管理的省
ArrayList<String> list1 = new ArrayList<>();
// 已有城市管理的市
@@ -642,7 +648,7 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("stores",stores);
- return PREFIX + "tSite_add.html";
+ return PREFIX + "TSite_add.html";
}
--
Gitblit v1.7.1