From 8064549857d1cbfc9e7b80024f666a3b006ed3e0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 三月 2025 21:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 9f4e903..b793c91 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -117,25 +117,25 @@
return SUCCESS_TIP;
}
- public static void main(String[] args) {
+// public static void main(String[] args) {
+//// HashMap<String, String> map = new HashMap<>();
+//// map.put("page","1");
+//// map.put("space_id","2010");
+//// // 获取门禁列表
+//// String s1 = HttpRequestUtil.getRequest
+//// ("https://port.daowepark.com/v7/user_api/general/getDevice", map);
+//// System.err.println(s1);
+//
// HashMap<String, String> map = new HashMap<>();
-// map.put("page","1");
-// map.put("space_id","2010");
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id","1");
+// map.put("device_id","1");
+// map.put("region_id","2010");
// // 获取门禁列表
// String s1 = HttpRequestUtil.getRequest
-// ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
+// ("https://port.daowepark.com/v7/user_api/general/getDevice", map);
// System.err.println(s1);
-
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","1");
- map.put("device_id","1");
- map.put("region_id","2010");
- // 获取门禁列表
- String s1 = HttpRequestUtil.getRequest
- ("https://try.daowepark.com/v7/user_api/general/getDevice", map);
- System.err.println(s1);
- };
+// };
/**
* 跳转到车辆管理首页
*/
@@ -567,8 +567,6 @@
tStore.setOperatorId(UserExt.getUser().getObjectId());
}
- user.setObjectId(tStore.getId());
- userService.updateById(user);
// 添加门店
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -583,7 +581,7 @@
map1.put("remark",tStore.getIntroduce());
map1.put("lat",tStore.getLat());
map1.put("lng",tStore.getLon());
- String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
+ String result = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpace", map1);
System.out.println(result);
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = jsonObject.getJSONObject("data");
@@ -591,7 +589,8 @@
Integer integer = Integer.valueOf(space_id);
tStore.setId(integer);
storeService.save(tStore);
- System.err.println(tStore);
+ user.setObjectId(tStore.getId());
+ userService.updateById(user);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
StoreConfig storeConfig = new StoreConfig();
@@ -608,7 +607,7 @@
// mapSite.put("name",tStore.getName());
// mapSite.put("space_id",tStore.getId().toString());
// mapSite.put("area_id",tSite.getId().toString());
-// HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
+// HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
// for (String s : tStore.getIds().split(",")) {
// HashMap<String, String> map = new HashMap<>();
// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -616,7 +615,7 @@
// map.put("device_id",s);
// map.put("region_id",tSite.getId().toString());
// // 添加门禁
-// String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+// String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addDevice", map);
// System.out.println(s1);
// }
return new SuccessTip<>();
@@ -892,8 +891,7 @@
@RequestMapping(value = "/deleteTwo")
public Object delete2(Integer id) {
try {
- storeOtherConfigService.removeById(id);
-
+ tStoreOtherConfigTrueService.removeById(id);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1