From 1c08cdb19aa0531dc77665dbbde052133dff9ceb Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 31 十月 2023 14:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 216 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 170 insertions(+), 46 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 6e46eaa..f10b1d3 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
@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,6 +10,7 @@
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
import com.dsh.course.feignClient.competition.CompetitionClient;
+import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
@@ -21,6 +23,7 @@
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import io.swagger.models.auth.In;
import org.apache.poi.ss.formula.functions.T;
+import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -77,6 +80,9 @@
@Autowired
private TOperatorService tOperatorService;
+ @Autowired
+ private ITSiteService siteService;
+
/**
* 跳转到车辆管理首页
@@ -95,16 +101,30 @@
*/
@RequestMapping("/tShop_add")
public String tCompetitionAdd(Model model) {
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
+
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
List<TOperator> list1 = tOperatorService.list();
-
+ 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);
+ }
// if (!roleid.equals("1")){
TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
- if (operator1!=null){
+ if(operator1!=null){
model.addAttribute("operator",operator1.getId());
}else {
model.addAttribute("operator",0);
@@ -112,8 +132,35 @@
// }
model.addAttribute("yysList",list1);
- return PREFIX + "tShop_add.html";
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
+ return PREFIX + "TShop_add.html";
}
+ // 运营商根据省筛选市区
+ @RequestMapping("/getCityYys")
+ @ResponseBody
+ public Object getCityYys(String province) {
+ Integer objectId = UserExt.getUser().getObjectId();
+
+ // todo
+ // 通过选择的省 获取管理的市
+ TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
+ .eq("code",province).eq("operatorId",objectId));
+
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
+ .eq("pid", province).eq("operatorId", UserExt.getUser().getObjectId()));
+ if (list.size() == 0){
+ // 管理整个省 获取这个省下的所有市
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ // 拿到省的id
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
+ // 获取省下面的所有市
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId()));
+ }else{
+ // 没有管理整个省 获取对应的市
+ return list;
+ }
+ }
+
@RequestMapping("/tShop_add_one")
public String tCompetitionAddOne(Integer id,Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
@@ -121,7 +168,7 @@
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("id",id);
- return PREFIX + "tShop_add_one.html";
+ return PREFIX + "TShop_add_one.html";
}
@RequestMapping("/tShop_add_two")
public String tCompetitionAddTwo(Integer id,Model model) {
@@ -186,13 +233,13 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_update1/{id}")
public String tCityUpdate1(@PathVariable Integer id, Model model) {
TStoreOther byId = storeOtherService.getById(id);
model.addAttribute("item",byId);
- return PREFIX + "tShop_edit_one.html";
+ return PREFIX + "TShop_edit_one.html";
}
@@ -203,14 +250,16 @@
TStoreOtherConfig byId = storeOtherConfigService.getById(id);
TTurn one = tTurnService.getOne(new LambdaQueryWrapper<TTurn>().eq(TTurn::getName, byId.getName()));
// page list
- List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+ if (one!=null) {
+ List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+ model.addAttribute("list", list);
+ }
// type list
List<TTurn> list1 = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, byId.getPageId()));
model.addAttribute("item",byId);
- model.addAttribute("list",list);
model.addAttribute("list1",list1);
- return PREFIX + "tShop_edit_two.html";
+ return PREFIX + "TShop_edit_two.html";
}
@RequestMapping("/tShop_update_one1/{id}")
public String tCityUpdateOne1(@PathVariable Integer id, Model model) {
@@ -224,7 +273,7 @@
model.addAttribute("list",list);
model.addAttribute("list1",list1);
- return PREFIX + "tShop_add_three.html";
+ return PREFIX + "TShop_add_three.html";
}
@@ -241,6 +290,7 @@
cityListQuery.setOffset(1);
cityListQuery.setLimit(10000);
cityListQuery.setCityCode(byId.getCityCode());
+ model.addAttribute("yysList", tOperatorService.list());
Page<TCityManager> list2 = cityClient.list(cityListQuery);
model.addAttribute("list1",list1);
model.addAttribute("list2",list2.getRecords());
@@ -250,14 +300,14 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",0);
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_gift/{id}")
public String tCityGift(@PathVariable Integer id, Model model) {
TStore byId = storeService.getById(id);
model.addAttribute("welfarePicture",byId.getWelfarePicture());
model.addAttribute("id",id);
- return PREFIX + "tShop_img.html";
+ return PREFIX + "TShop_img.html";
}
@RequestMapping("/tShop_indexSet/{id}")
public String tCityIndexSet(@PathVariable Integer id, Model model) {
@@ -278,7 +328,7 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
- return PREFIX + "tShop_imgAll.html";
+ return PREFIX + "TShop_imgAll.html";
}
@@ -286,7 +336,15 @@
@ResponseBody
public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
- List<TStoreListVo> list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ String roleid = UserExt.getUser().getRoleid();
+ List<TStoreListVo> list =new ArrayList<>();
+ if("3".equals(roleid)){
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }else {
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }
page.setRecords(list);
return super.packForBT(page);
}
@@ -317,14 +375,13 @@
@RequestMapping(value = "/add")
@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,String provinceCode,String cityCode) {
+ 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){
+ if(yyId==null || type==1){
yyId=0;
}
-
if(yyId!=0) {
List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
if(list1.size()>0){
@@ -357,16 +414,25 @@
}else {
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, pCode1));
- tStore.setProvince(one.getName());
- tStore.setProvinceCode(one.getCode());
+ if (one !=null){
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ }
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cCode1));
- tStore.setCity(one1.getName());
- tStore.setCityCode(one1.getCode());
+ if (one1 !=null){
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
tStore.setIds(ids);
- tStore.setType(type);
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setType(2);
+ }else{
+ tStore.setType(type);
+ }
+
tStore.setOperatorId(yyId);
tStore.setState(1);
tStore.setCreateTime(new Date());
@@ -377,24 +443,35 @@
}
user.setAccount(userPhone);
user.setName(userName);
- user.setRoleid("2");
+ user.setRoleid("3");
user.setPhone(userPhone);
user.setPassword(SecureUtil.md5("a123456"));
+ user.setObjectType(3);
+ user.setStatus(1);
userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
-
+ tStore.setOperatorId(UserExt.getUser().getObjectId());
storeService.save(tStore);
+ user.setObjectId(tStore.getId());
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","");
- map.put("device_id",tStore.getIds()+"");
- map.put("region_id",tStore.getId()+"");
- // 添加门禁
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+
+
+ // 添加场地
+ TSite tSite = new TSite();
+ tSite.setName(tStore.getName());
+ tSite.setStoreId(tStore.getId());
+ tSite.setSign(1);
+ siteService.save(tSite);
+
+ 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);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
@@ -406,6 +483,41 @@
storeConfigs.add(storeConfig);
}
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);
+
+
+
+ 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();
@@ -483,16 +595,30 @@
tStore.setLon(lon);
tStore.setLat(lat);
storeService.updateById(tStore);
- HashMap<String, String> map = new HashMap<>();
- map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
- map.put("space_id","");
- map.put("device_id",tStore.getIds());
- map.put("region_id",tStore.getId()+"");
- // 编辑门禁
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/editDevice/ids/82", map);
- JSONObject jsonObject = JSONObject.parseObject(s);
- JSONObject data = jsonObject.getJSONObject("data");
- String spaceId = data.getString("space_id");
+ String ids1 = byIdc.getIds();
+
+
+
+ HashMap<String, String> mapx = new HashMap<>();
+ mapx.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ for (String s : ids1.split(",")) {
+ String post = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,mapx);
+ System.out.println(post);
+ }
+
+ for (String s : ids.split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",tStore.getId()+"");
+ map1.put("device_id",s);
+ map1.put("region_id","");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
+
+
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -646,10 +772,8 @@
@RequestMapping(value = "/deleteTwo")
public Object delete2(Integer id) {
try {
- TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+ storeOtherConfigService.removeById(id);
- byId.setState(2);
- tStoreOtherConfigTrueService.updateById(byId);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1