From 889749753021d76463d85450bd95e6615886956e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 22:34:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index a7e4c49..b5d45cb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -109,7 +109,6 @@
@RequestMapping("/tolist")
public String tolist(Model model) {
-
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
String roleid = UserExt.getUser().getRoleid();
@@ -335,8 +334,8 @@
TStore st = storeService.getById(store);
map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map3.put("space_id", st.getId() + "");
- map4.put("space_id", st.getId() + "");
+ map3.put("space_id", si.getId() + "");
+ map4.put("space_id", si.getId() + "");
map3.put("name", blue);
map4.put("name", red);
map3.put("city_code", city);
@@ -357,18 +356,17 @@
game.setBlue(""+sutuId);
game.setRed(""+sutuId1);
- // 生成设备二维码
+ // 生成红蓝sutu二维码
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("scan_type", "1000");
blueCode.put("sutu_id", ""+sutuId);
- blueCode.put("space_id", st.getId() + "");
-
+ blueCode.put("space_id", si.getId() + "");
HashMap<String, String> redCode = new HashMap<>();
redCode.put("scan_type", "1000");
redCode.put("sutu_id", sutuId1+"");
- redCode.put("space_id", st.getId() + "");
- String blueS= "{\"scan_type\": 1000, \"space_id\": "+st.getId()+", \"sutu_id\": "+sutuId+"}";
- String redS= "{\"scan_type\": 1000, \"space_id\": "+st.getId()+", \"sutu_id\": "+sutuId1+"}";
+ redCode.put("space_id", si.getId() + "");
+ String blueS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId+"}";
+ String redS= "{\"scan_type\": 1000, \"space_id\": "+si.getId()+", \"sutu_id\": "+sutuId1+"}";
MyQrCodeUtil.createCodeToFile(blueS);
MyQrCodeUtil.createCodeToFile(redS);
BufferedImage blueImage = QRCodeUtil.createImage(blueS);
@@ -377,16 +375,10 @@
MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
String s = OssUploadUtil.ossUpload("img/", blueFile);
String s1 = OssUploadUtil.ossUpload("img/", redFile);
-// MultipartFile multipartFile = convert(blueImage);
-// MultipartFile multipartFile1 = convert(redImage);
-//
-// String s = OssUploadUtil.ossUpload("img/", multipartFile);
-// String s1 = OssUploadUtil.ossUpload("img/", multipartFile1);
game.setBlueCode(s);
game.setRedCode(s1);
Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
-
//玩湃跨城赛
TGameConfig gameConfigkuacheng = new TGameConfig();
gameConfigkuacheng.setId(kcId);
@@ -400,9 +392,7 @@
System.out.println("========gameConfig======"+gameConfigkuacheng);
gameConfigList.add(gameConfigkuacheng);
System.out.println("======gameConfigList======="+gameConfigList);
-
//社区冠军赛
-
TGameConfig gameConfigshequ = new TGameConfig();
gameConfigshequ.setId(shequIId);
gameConfigshequ.setGameId(shequId);
--
Gitblit v1.7.1