From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 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 7c8260e..28814f3 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,7 +1,6 @@
package com.dsh.guns.modular.system.controller.system;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.Md5Utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,7 +9,6 @@
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
import com.dsh.course.feignClient.account.CoachClient;
-import com.dsh.course.feignClient.account.model.CityManager;
import com.dsh.course.feignClient.account.model.Coach;
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.course.CoursePackageClient;
@@ -18,7 +16,6 @@
import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient;
import com.dsh.course.feignClient.course.CoursePackageTypeClient;
import com.dsh.course.feignClient.course.model.TCoursePackage;
-import com.dsh.course.feignClient.course.model.TCoursePackageType;
import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.model.Site;
@@ -31,32 +28,17 @@
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
-import com.google.common.base.Ascii;
-import com.google.gson.JsonObject;
-import com.netflix.ribbon.proxy.annotation.Http;
-import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
-import io.netty.util.AsciiString;
-import io.rong.util.HttpUtil;
-import io.swagger.models.auth.In;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.logging.log4j.util.Base64Util;
+
+import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.util.Base64Utils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+
import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
@@ -100,6 +82,7 @@
private CoursePackageClient coursePackageClient;
@Autowired
private AppUserClient appUserClient;
+
@RequestMapping("/tolist")
public String tolist(Model model) {
@@ -242,6 +225,7 @@
, String zs, BigDecimal zsCoin, BigDecimal zsCash, String zsImage, BigDecimal zsInt, Integer zsId,Integer zsIId
, String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId
, String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId
+ ,String sutuName
) {
@@ -278,8 +262,27 @@
game.setOperationId(0);
}
System.out.println("============"+game);
- Integer gameId = ballClient.save(game);
+ // 添加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", 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);
+ Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
@@ -411,10 +414,25 @@
gameConfigly.setIntegral(lyInt);
gameConfigly.setOtherId(gameId);
gameConfigList.add(gameConfigly);
+ HashMap<String, String> map1 = new HashMap<>();
+ HashMap<String, String> map2 = new HashMap<>();
+
+
+ map1.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id", si.getId() + "");
+ map1.put("device_id", red);
+ map1.put("region_id", st.getId() + "");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ map2.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
+ map2.put("space_id", si.getId() + "");
+ map2.put("device_id", blue);
+ map2.put("region_id", st.getId() + "");
+ // 添加门禁
+ String s2 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map2);
- System.out.println("---------------------------"+gameConfigList);
ballClient.saveConfig( gameConfigList);
return null;
}
@@ -458,11 +476,9 @@
private TGameConfigService gameConfigService;
@RequestMapping("/pre_edit/{id}")
public String pre_edit(@PathVariable("id") Integer id,Model model) {
-
Game game = ballClient.queryGame(id);
- System.out.println("---------game------"+game);
+ System.out.println("---------game------"+game);
model.addAttribute("game",game);
-
if (game.getOperationId() ==0){
model.addAttribute("opId","平台");
model.addAttribute("is","平台");
--
Gitblit v1.7.1