From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 93 +++++++++++++++++++++++++++++-----------------
1 files changed, 59 insertions(+), 34 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 4f9e5a3..e86fe36 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
@@ -86,24 +86,23 @@
private IUserService userService;
+ // 添加SUTU
@RequestMapping("/tShop_addDevice/{id}")
public String addDevice(@PathVariable("id") Integer id,Model model) {
- // 查询门店下的所有场地
- List<TSite> list = siteService.list(new QueryWrapper<TSite>().eq("storeId", id));
// 门店id
model.addAttribute("id",id);
- model.addAttribute("list",list);
return PREFIX + "TShop_add_device.html";
}
@RequestMapping("/addDevice")
- public Object addDevice(Integer id,Integer siteId,String device) {
+ public Object addDevice(Integer id,String device) {
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("space_id",id.toString());
- map.put("device_id",device);
- map.put("region_id",siteId+"");
+ map.put("name",device);
+ map.put("city_code","");
// 添加门禁
- String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+ String s1 = HttpRequestUtil.postRequest
+ ("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map);
return SUCCESS_TIP;
}
@@ -162,11 +161,20 @@
@RequestMapping("/getProvinceYys")
@ResponseBody
public Object getProvinceYys(Integer operatorId) {
- // 获取运营商管理的所有省
- List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", operatorId)
- .eq("pid", 0));
+ // 判断当前运营商是管理全国还是指定区域
+ TOperator byId = tOperatorService.getById(operatorId);
+ // 说明是管理全国
+ if (byId.getType()==1){
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ return list;
+ }else{
+ // 获取运营商管理的所有省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", operatorId)
+ .eq("pid", 0));
+ return list;
+ }
- return list;
+
}
// 运营商根据省筛选市区
@RequestMapping("/getCityYys")
@@ -438,8 +446,6 @@
@ResponseBody
public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
-
-
if(yyId==null || type==1){
yyId=0;
}
@@ -523,9 +529,32 @@
if (UserExt.getUser().getObjectType()==2){
tStore.setOperatorId(UserExt.getUser().getObjectId());
}
- storeService.save(tStore);
+
user.setObjectId(tStore.getId());
userService.updateById(user);
+ // 添加门店
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("name",tStore.getName());
+ map1.put("short_name",tStore.getName());
+ map1.put("location",tStore.getCity());
+ map1.put("address",tStore.getAddress());
+ map1.put("telephone",tStore.getPhone());
+ map1.put("linkman",userName);
+ map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
+ map1.put("logo",tStore.getCoverDrawing());
+ 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);
+ System.out.println(result);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String space_id = data.getString("space_id");
+ Integer integer = Integer.valueOf(space_id);
+ tStore.setId(integer);
+ storeService.save(tStore);
+ System.err.println(tStore);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
StoreConfig storeConfig = new StoreConfig();
@@ -537,26 +566,22 @@
}
storeConfigService.saveBatch(storeConfigs);
-
-// // 添加门店
-// HashMap<String, String> map1 = new HashMap<>();
-// map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
-// map1.put("name",tStore.getName());
-// map1.put("short_name",tStore.getName());
-// map1.put("location",tStore.getCity());
-// map1.put("address",tStore.getAddress());
-// map1.put("telephone",tStore.getPhone());
-// map1.put("linkman",userName);
-// map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
-// map1.put("logo",tStore.getCoverDrawing());
-// map1.put("remark",tStore.getIntroduce());
-// map1.put("lat",tStore.getLat());
-// map1.put("lng",tStore.getLon());
-// map1.put("space_id",tStore.getId().toString());
-// String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
-// System.out.println(result);
-
-
+// HashMap<String, String> mapSite = new HashMap<>();
+// mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// 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);
+// for (String s : tStore.getIds().split(",")) {
+// HashMap<String, String> map = new HashMap<>();
+// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+// map.put("space_id",tStore.getId()+"");
+// 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);
+// System.out.println(s1);
+// }
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1