From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 139 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 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 e86fe36..27ded08 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
@@ -2,6 +2,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,6 +10,9 @@
import com.dsh.course.feignClient.account.CityClient;
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;
import com.dsh.course.mapper.UserMapper;
@@ -28,7 +32,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -84,6 +90,8 @@
private ITSiteService siteService;
@Autowired
private IUserService userService;
+ @Autowired
+ private WorldCupStoreClient worldCupStoreClient;
// 添加SUTU
@@ -93,8 +101,10 @@
model.addAttribute("id",id);
return PREFIX + "TShop_add_device.html";
}
+
@RequestMapping("/addDevice")
public Object addDevice(Integer id,String device) {
+ // 应该是不用他了
HashMap<String, String> map = new HashMap<>();
map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
map.put("space_id",id.toString());
@@ -102,10 +112,30 @@
map.put("city_code","");
// 添加门禁
String s1 = HttpRequestUtil.postRequest
- ("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map);
+ ("https://try.daowepark.c" +
+ "om/v7/user_api/general/addSpaceSutu", map);
return SUCCESS_TIP;
}
+// 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://port.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://port.daowepark.com/v7/user_api/general/getDevice", map);
+// System.err.println(s1);
+// };
/**
* 跳转到车辆管理首页
*/
@@ -145,12 +175,12 @@
}
// if (!roleid.equals("1")){
- TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
- if(operator1!=null){
- model.addAttribute("operator",operator1.getId());
- }else {
- model.addAttribute("operator",0);
- }
+ TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
+ if(operator1!=null){
+ model.addAttribute("operator",operator1.getId());
+ }else {
+ model.addAttribute("operator",0);
+ }
// }
model.addAttribute("yysList",list1);
@@ -193,7 +223,7 @@
}else{
List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
.eq("operatorId", operatorId)
- .eq("pid",byId.getId()));
+ .eq("pid",byId.getId()));
if (list.size() == 0){
// 说明管理整个省
TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
@@ -283,7 +313,7 @@
model.addAttribute("list2",list2.getRecords());
String roleid = UserExt.getUser().getRoleid();
- model.addAttribute("role",roleid);
+ model.addAttribute("role",roleid);
model.addAttribute("time",byId.getStartTime()+" - "+byId.getEndTime());
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
@@ -369,6 +399,7 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",0);
+
return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_gift/{id}")
@@ -397,6 +428,12 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
+ List<WorldCupStoreVO> worldCupStores = worldCupStoreClient.getWorldCupStoreListByStoreId(id);
+ if (CollectionUtils.isEmpty(worldCupStores)){
+ model.addAttribute("worldCupStores",new ArrayList<>());
+ }else{
+ model.addAttribute("worldCupStores",worldCupStores);
+ }
return PREFIX + "TShop_imgAll.html";
}
@@ -454,7 +491,7 @@
if(list1.size()>0){
if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("code",tStore.getProvinceCode())
- .eq("operatorId",yyId));
+ .eq("operatorId",yyId));
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
@@ -519,13 +556,13 @@
user.setStatus(1);
userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
- tStore.setLon(lon);
- tStore.setLat(lat);
- if (yyId == null || yyId == 0){
- tStore.setOperatorId(0);
- }else{
- tStore.setOperatorId(yyId);
- }
+ tStore.setLon(lon);
+ tStore.setLat(lat);
+ if (yyId == null || yyId == 0){
+ tStore.setOperatorId(0);
+ }else{
+ tStore.setOperatorId(yyId);
+ }
if (UserExt.getUser().getObjectType()==2){
tStore.setOperatorId(UserExt.getUser().getObjectId());
}
@@ -546,7 +583,7 @@
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);
+ String result = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpace", map1);
System.out.println(result);
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject data = jsonObject.getJSONObject("data");
@@ -565,13 +602,13 @@
storeConfigs.add(storeConfig);
}
storeConfigService.saveBatch(storeConfigs);
-
+ // 废弃添加门店时 添加闸机
// 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);
+// HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
// for (String s : tStore.getIds().split(",")) {
// HashMap<String, String> map = new HashMap<>();
// map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -579,7 +616,7 @@
// 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);
+// String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addDevice", map);
// System.out.println(s1);
// }
return new SuccessTip<>();
@@ -688,7 +725,7 @@
@ResponseBody
public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,
String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,
- Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8) {
+ Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,String str) {
try {
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
StoreConfig collect1 = collect(id, px1, r1, c1, 1);
@@ -708,6 +745,26 @@
storeConfigs.add(collect7);
storeConfigs.add(collect8);
storeConfigService.updateBatchById(storeConfigs);
+
+ // 修改世界杯
+ JSONArray jsonArray = JSONObject.parseArray(str);
+ List<WorldCupStore> worldCupStores = new ArrayList<>();
+ for (Object o : jsonArray) {
+ String s = JSONObject.toJSONString(o);
+ JSONObject jsonObject = JSONObject.parseObject(s);
+ Integer id1 = jsonObject.getInteger("id");
+ String backgroundImage = jsonObject.getString("backgroundImage");
+ Integer isOpen = jsonObject.getInteger("isOpen");
+ Integer sort = jsonObject.getInteger("sort");
+ WorldCupStore worldCupStore = new WorldCupStore();
+ worldCupStore.setSort(sort);
+ worldCupStore.setId(id1);
+ worldCupStore.setBackgroundImage(backgroundImage);
+ worldCupStore.setIsOpen(isOpen);
+ worldCupStores.add(worldCupStore);
+ }
+ worldCupStoreClient.updateWorldCupStoreListById(worldCupStores);
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -716,12 +773,27 @@
}
private StoreConfig collect(Integer id,Integer sort,Integer isOpen,String img,int type){
- StoreConfig one = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType, type));
- one.setSort(sort);
- one.setIsOpen(isOpen);
- if(ToolUtil.isNotEmpty(img)){
- one.setBackgroundImage(img);
+ StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>()
+ .eq("storeId", id)
+ .eq("type", type));
+ if (one!=null){
+ one.setSort(sort);
+ one.setIsOpen(isOpen);
+ if(ToolUtil.isNotEmpty(img)){
+ one.setBackgroundImage(img);
+ }
}
+ if (one == null){
+ StoreConfig storeConfig = new StoreConfig();
+ storeConfig.setStoreId(id);
+ storeConfig.setType(type);
+ storeConfig.setIsOpen(isOpen);
+ storeConfig.setSort(sort);
+ storeConfig.setBackgroundImage(img);
+ storeConfigService.save(storeConfig);
+ return storeConfig;
+ }
+
return one;
}
@RequestMapping(value = "/oneChangeNext")
@@ -820,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();
@@ -959,7 +1030,7 @@
@ResponseBody
public Object addConfigOne(String url,String name,Integer page,Integer type,String turnId,Integer sort) {
try {
- storeService.addConfigOne(url,name,page,type,turnId,sort);
+ storeService.addConfigOne(url,name,page,type,turnId,sort);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -992,7 +1063,7 @@
}
- return SUCCESS_TIP;
+ return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -1008,7 +1079,7 @@
storeOtherService.updateById(byId);
- return SUCCESS_TIP;
+ return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -1070,9 +1141,9 @@
@RequestMapping(value = "/addConfigOne9")
@ResponseBody
public Object addConfigOne9(String url,String name,Integer page,Integer type,String turnId,Integer sort,Integer id) {
- try {
+ try {
TStoreOtherConfigTrue byId = new TStoreOtherConfigTrue();
- byId.setPid(id);
+ byId.setPid(id);
if(ToolUtil.isNotEmpty(url)){
byId.setUrl(url);
}
--
Gitblit v1.7.1