From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +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 | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 9410708..eadb4c6 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
@@ -11,6 +11,7 @@
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupStore;
+import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupStoreVO;
import com.dsh.course.feignClient.communityWorldCup.WorldCupStoreClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.other.model.Site;
@@ -116,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://try.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);
// 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);
- };
+// };
/**
* 跳转到车辆管理首页
*/
@@ -427,7 +428,7 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
- List<WorldCupStore> worldCupStores = worldCupStoreClient.getWorldCupStoreListByStoreId(id);
+ List<WorldCupStoreVO> worldCupStores = worldCupStoreClient.getWorldCupStoreListByStoreId(id);
if (CollectionUtils.isEmpty(worldCupStores)){
model.addAttribute("worldCupStores",new ArrayList<>());
}else{
@@ -891,8 +892,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