From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 160 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 111 insertions(+), 49 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 7b8a5aa..2d1c91f 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
@@ -34,12 +34,16 @@
import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
+import org.apache.http.HttpResponse;
+import org.apache.poi.ss.formula.functions.T;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
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;
import javax.annotation.Resource;
import java.lang.reflect.Type;
@@ -271,13 +275,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);
@@ -290,6 +333,7 @@
model.addAttribute("type",1);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
+
model.addAttribute("stores",stores);
String nextName = site.getNextName();
@@ -467,35 +511,25 @@
site.setCityManagerId(cityManagerId);
site.setInsertTime(new Date());
site.setState(1);
- 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",integer1.toString());
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map);
-
- // 添加门禁
+ map.put("space_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");
+ 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);
-
- 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);
- }
-
return ResultUtil.success("添加成功");
}
-
-
/**
* 编辑场地管理
*/
@@ -526,24 +560,30 @@
site.setState(1);
siteClient.addSite(site);
- 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);
- }
-
- 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);
- }
+ /**
+ * 取消闸机输入 新增模块闸机管理
+ */
+// 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", 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);
+// }
+// }
@@ -597,7 +637,21 @@
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
@@ -609,6 +663,7 @@
@RequestMapping("/add")
public String tCompetitionAdd(Model model) {
List<CityManager> province = cityManagerClient.listAll();
+ System.out.println(province);
// 已有城市管理的省
ArrayList<String> list1 = new ArrayList<>();
// 已有城市管理的市
@@ -621,9 +676,13 @@
Integer objectId = UserExt.getUser().getObjectId();
List<Store> stores = new ArrayList<>();
if (objectType ==2 ){
- stores= storeClient.getStoreByCityManagerId(objectId);
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
+ model.addAttribute("stores",operatorId);
}else if(objectType == 3){
- stores= storeClient.getStoreByStoreStaffId(objectId);;
+ List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, objectId));
+ model.addAttribute("stores",list);
+ }else {
+ model.addAttribute("stores",storeService.list(new QueryWrapper<TStore>().eq("operatorId", 0)));
}
List<TOperator> list = tOperatorService.list();
model.addAttribute("yysList",list);
@@ -639,8 +698,9 @@
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
- model.addAttribute("stores",stores);
- return PREFIX + "tSite_add.html";
+
+ return PREFIX + "TSite_add.html";
+
}
// /**
@@ -698,7 +758,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