From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 193 ++++++++++++++++++++++++++++--------------------
1 files changed, 113 insertions(+), 80 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 18ce72b..9c652e9 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
@@ -116,29 +116,10 @@
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
model.addAttribute("userType",objectType);
- List<CityManager> province = cityManagerClient.listAll();
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
- }
- HashSet<String> set = new HashSet<String>(list1);
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
-
List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
-
-
-
-
-
-
-
model.addAttribute("list",list3);
model.addAttribute("siteType",siteType);
String roleid = UserExt.getUser().getRoleid();
@@ -146,12 +127,8 @@
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("type",1);
-
-
List<TOperator> list5 = tOperatorService.list();
-
model.addAttribute("list5",list5);
-
return PREFIX + "TSite.html";
}
/**
@@ -275,13 +252,52 @@
strings.add(cityManager.getCity());
}
HashSet<String> set1 = new HashSet<String>(strings);
- List<Store> stores = new ArrayList<>();
- if (objectType ==2 ){
- stores= storeClient.getStoreByCityManagerId(objectId);
- }else if(objectType == 3){
- stores= storeClient.getStoreByStoreStaffId(objectId);;
+ List<TStore> stores = new ArrayList<>();
+// // 先判断
+// if (objectType ==2 ){
+// stores= storeClient.getStoreByCityManagerId(objectId);
+// }else if(objectType == 3){
+// stores= storeClient.getStoreByStoreStaffId(objectId);;
+// }else{
+// stores = storeClient.getStore(site.getCity());
+// }
+ // 根据门店id 确定是平台还是运营商的
+ TStore byId = storeService.getById(site.getStoreId());
+ if (byId.getType()==1){
+ // 查询平台的门店
+ if (objectType ==2 ){
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("type", 1)
+ .eq("operatorId",objectId));
+ }else if (objectType ==2 ){
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("id",objectId));
+ }else{
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("type", 1)
+ );
+ }
}else{
- stores = storeClient.getStore(site.getCity());
+ // 查询平台的门店
+ if(objectType == 2){
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("type", 2)
+ .eq("operatorId",objectId));
+ }else if (objectType == 3){
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("id",objectId));
+ }else{
+ stores = storeService.list(new QueryWrapper<TStore>()
+ .eq("state", 1)
+ .eq("type", 2)
+ );
+ }
+
}
List<CityManager> accounts = cityManagerClient.getAccount(site.getCity());
model.addAttribute("list",site);
@@ -294,6 +310,7 @@
model.addAttribute("type",1);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
+
model.addAttribute("stores",stores);
String nextName = site.getNextName();
@@ -471,31 +488,23 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
- site.setOperatorId(UserExt.getUser().getObjectId());
- Integer integer1 = siteClient.addSite(site);
+// site.setOperatorId(UserExt.getUser().getObjectId());
+ // 添加场地
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);
- // 添加门禁
+ ("https://port.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.addSite1(site);
// 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", store.getId().toString() + "");
- 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);
- }
- }
+
return ResultUtil.success("添加成功");
}
/**
@@ -528,27 +537,32 @@
site.setState(1);
siteClient.addSite(site);
- String ids = byId.getIds();
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- 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);
- }
- }
- 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", site.getId() + "");
- map1.put("device_id", s);
- map1.put("region_id", store.getId() + "");
- // 添加门禁
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
- System.out.println(s1);
- }
- }
+ /**
+ * 取消闸机输入 新增模块闸机管理
+ */
+// String ids = byId.getIds();
+// HashMap<String, String> map = new HashMap<>();
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// if(StringUtils.hasLength(ids)) {
+// for (String s : ids.split(",")) {
+// String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s, map);
+// 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://port.daowepark.com/v7/user_api/general/addDevice", map1);
+// System.out.println(s1);
+// }
+// }
+
+
return ResultUtil.success();
}
@@ -600,26 +614,47 @@
vo.setObjectType(type);
vo.setObjectId(objectId);
vo.setOpId(opId);
- return siteClient.listExipre(vo);
+ List<TSiteDTO> tSiteDTOS = siteClient.listExipre(vo);
+ for (TSiteDTO tSiteDTO : tSiteDTOS) {
+ Integer storeId = tSiteDTO.getStoreId();
+ TStore byId = storeService.getById(storeId);
+ if (byId!=null){
+ if (byId.getType()==1){
+ tSiteDTO.setOperator("平台");
+ }else{
+ TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
+ if (byId1!=null)
+ tSiteDTO.setOperator(byId1.getName());
+ }
+ }
+ }
+ return tSiteDTOS;
}
@Autowired
private TOperatorService tOperatorService;
-
+ @Autowired
+ private TOperatorCityService operatorCityService;
/**
* 跳转到添加场地管理
*/
@RequestMapping("/add")
public String tCompetitionAdd(Model model) {
- List<CityManager> province = cityManagerClient.listAll();
- System.out.println(province);
- // 已有城市管理的省
- ArrayList<String> list1 = new ArrayList<>();
- // 已有城市管理的市
- ArrayList<String> list2 = new ArrayList<>();
- for (CityManager cityManager : province) {
- list1.add(cityManager.getProvince());
- list2.add(cityManager.getCity());
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id.getType()==1){
+ // 全国
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list);
+ }
+ }else{
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
}
Integer objectType = UserExt.getUser().getObjectType();
Integer objectId = UserExt.getUser().getObjectId();
@@ -636,13 +671,11 @@
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
model.addAttribute("userType",objectType);
- HashSet<String> set = new HashSet<String>(list1);
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
model.addAttribute("siteType",siteType);
- model.addAttribute("province",set);
- model.addAttribute("city",list2);
+ model.addAttribute("province",list);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
--
Gitblit v1.7.1