From 3b9d9ec597651856ec407abbb6d27f40ae0bc859 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:36:12 +0800
Subject: [PATCH] 客户修改需求 智慧球场修改不重新生成sutuID
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 167 +++++++++++++++++++++++++++----------------------------
1 files changed, 82 insertions(+), 85 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 eac9e98..ed267ec 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
@@ -1,6 +1,5 @@
package com.dsh.guns.modular.system.controller.system;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -40,6 +39,7 @@
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import org.apache.commons.fileupload.FileItem;
import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
+import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource;
@@ -231,27 +231,6 @@
return ResultUtil.success();
}
-// public static void main(String[] args) {
-// // 添加sutu编号
-// HashMap<String, String> map3 = new HashMap<>();
-// // 添加sutu编号
-// // 添加门禁 红蓝方
-// TSite si = siteService.getById(site);
-// TStore st = storeService.getById(store);
-// map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
-// map3.put("space_id", si.getId() + "");
-// map3.put("name", ToolUtil.isEmpty(sutuName) ? "" : sutuName);
-// map3.put("city_code", "");
-// String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map3);
-// System.out.println("---------------------------"+s3);
-// JSONObject jsonObject = new JSONObject(s3);
-// // 获取 data 字段的值
-// JSONObject dataObject = jsonObject.getJSONObject("data");
-// // 获取 sutu_id 字段的值
-// String sutuIdValue = dataObject.getString("sutu_id");
-// Integer sutuId = Integer.valueOf(sutuIdValue);
-// game.setSutuId(sutuId);
-// }
public static MultipartFile convert(BufferedImage bufferedImage, String fileName) throws IOException {
// 将 BufferedImage 转换为字节数组
@@ -271,6 +250,29 @@
);
return multipartFile;
+ }
+ public static void main(String[] args) throws Exception {
+ // 生成红蓝sutu二维码
+ HashMap<String, String> blueCode = new HashMap<>();
+ blueCode.put("scan_type", "1000");
+ blueCode.put("sutu_id", ""+1041);
+ blueCode.put("space_id", 46 + "");
+ HashMap<String, String> redCode = new HashMap<>();
+ redCode.put("scan_type", "1000");
+ redCode.put("sutu_id", 1040+"");
+ redCode.put("space_id", 46 + "");
+ String blueS= "{\"scan_type\": 1000, \"space_id\": "+46+", \"sutu_id\": "+1041+"}";
+ String redS= "{\"scan_type\": 1000, \"space_id\": "+46+", \"sutu_id\": "+1040+"}";
+ MyQrCodeUtil.createCodeToFile(blueS);
+ MyQrCodeUtil.createCodeToFile(redS);
+ BufferedImage blueImage = QRCodeUtil.createImage(blueS);
+ BufferedImage redImage = QRCodeUtil.createImage(redS);
+ MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ String s = OssUploadUtil.ossUpload("img/", blueFile);
+ String s1 = OssUploadUtil.ossUpload("img/", redFile);
+ System.err.println("蓝色"+ s);
+ System.err.println("蓝色"+s1);
}
@RequestMapping("/save")
@ResponseBody
@@ -316,6 +318,7 @@
game.setId(id);
+
if (!operationId.equals("平台")){
game.setOperationId(Integer.valueOf(operationId));}
else {
@@ -323,22 +326,31 @@
}
System.out.println("============"+game);
- // 判断一下新增还是修改
- // 如果是修改的话判断 有没有修改场地id 有的话需要重新生成二维码 和sutuid
- if(id!=null){
- Game game1 = ballClient.queryGame(id);
- // 如果场地id不相同那么要重新生成sutu二维码
- if (!game1.getSiteId().equals(site)){
- // 添加sutu编号
+ // 判断是新增还是修改 修改不会重新生成sutuId
+ if (game.getId()==null){
+ HashMap<String, String> map5 = new HashMap<>();
+ map5.put("space_id", store+"");
+ map5.put("area_id", site+"");
+ String s5 = HttpRequestUtil.getRequest("https://try.daowepark.com/v7/user_api/general/get_space_sutu", map5);
+ System.err.println(s5);
+ JSONObject jsonObject5 = new JSONObject(s5);
+ // 获取 data 字段的值
+ JSONArray data = jsonObject5.getJSONArray("data");
+ Integer temp = null; // 临时sutuid
+ Integer temp1 = null; // 临时sutuid
+ TSite si = siteService.getById(site);
+ if (data.length() == 0){
+ // 这个场地没有添加过sutu
HashMap<String, String> map3 = new HashMap<>();
HashMap<String, String> map4 = new HashMap<>();
// 添加sutu编号
// 调用两次 创建sutu
- TSite si = siteService.getById(site);
map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map3.put("space_id", si.getId() + "");
- map4.put("space_id", si.getId() + "");
+ map3.put("space_id", store + "");
+ map3.put("area_id", si.getId() + "");
+ map4.put("space_id", store + "");
+ map4.put("area_id", si.getId() + "");
map3.put("name", blue);
map4.put("name", red);
map3.put("city_code", city);
@@ -357,7 +369,6 @@
Integer sutuId1 = Integer.valueOf(sutuIdValue1);
game.setBlue(""+sutuId);
game.setRed(""+sutuId1);
-
// 生成红蓝sutu二维码
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("scan_type", "1000");
@@ -379,60 +390,46 @@
String s1 = OssUploadUtil.ossUpload("img/", redFile);
game.setBlueCode(s);
game.setRedCode(s1);
+ }else{
+ Integer sutuid=0;
+ Integer sutuid1=0;
+ JSONObject element = data.getJSONObject(0);
+ if (site==27){
+ sutuid=1036;
+ sutuid1=1037;
+ game.setBlue(sutuid.toString());
+ game.setRed(sutuid1.toString());
+ }else{
+ sutuid = element.getInt("id");
+ game.setBlue(sutuid.toString());
+ JSONObject element1 = data.getJSONObject(1);
+ sutuid1 = element1.getInt("id");
+ game.setRed(sutuid1.toString());
+ }
+ // 生成红蓝sutu二维码
+ HashMap<String, String> blueCode = new HashMap<>();
+ blueCode.put("scan_type", "1000");
+ blueCode.put("sutu_id", ""+sutuid);
+ 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", 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);
+ BufferedImage redImage = QRCodeUtil.createImage(redS);
+ MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
+ String s = OssUploadUtil.ossUpload("img/", blueFile);
+ String s1 = OssUploadUtil.ossUpload("img/", redFile);
+ game.setBlueCode(s);
+ game.setRedCode(s1);
}
- }else{
- // 添加sutu编号
- HashMap<String, String> map3 = new HashMap<>();
- HashMap<String, String> map4 = new HashMap<>();
- // 添加sutu编号
- // 调用两次 创建sutu
- TSite si = siteService.getById(site);
- map3.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- map4.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
- 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);
- map4.put("city_code", city);
- String s3 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map3);
- String s4 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceSutu", map4);
- System.out.println("---------------------------"+s3);
- JSONObject jsonObject = new JSONObject(s3);
- JSONObject jsonObject1 = new JSONObject(s4);
- // 获取 data 字段的值
- JSONObject dataObject = jsonObject.getJSONObject("data");
- JSONObject dataObject1 = jsonObject1.getJSONObject("data");
- // 获取 sutu_id 字段的值
- String sutuIdValue = dataObject.getString("sutu_id");
- String sutuIdValue1 = dataObject1.getString("sutu_id");
- Integer sutuId = Integer.valueOf(sutuIdValue);
- Integer sutuId1 = Integer.valueOf(sutuIdValue1);
- 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", si.getId() + "");
- HashMap<String, String> redCode = new HashMap<>();
- redCode.put("scan_type", "1000");
- redCode.put("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);
- BufferedImage redImage = QRCodeUtil.createImage(redS);
- MultipartFile blueFile = convert(blueImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
- String s = OssUploadUtil.ossUpload("img/", blueFile);
- String s1 = OssUploadUtil.ossUpload("img/", redFile);
- game.setBlueCode(s);
- game.setRedCode(s1);
}
+
Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
//玩湃跨城赛
--
Gitblit v1.7.1