From 3056a5264c11a707be8360f4bc4c2d83ea5ce2dd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 18 十月 2023 09:47:47 +0800
Subject: [PATCH] 智慧球场数据统计bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 75 +++++++++---------------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GameDataController.java | 72 +----------------------
2 files changed, 33 insertions(+), 114 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GameDataController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GameDataController.java
index 51c79c4..4162750 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GameDataController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GameDataController.java
@@ -205,7 +205,7 @@
*/
@RequestMapping("/list")
@ResponseBody
- public Object list(String storeId) {
+ public Object list(String range,String storeId) {
Map<String, Object> result = new HashMap<>();
try {
// 年度数据
@@ -214,7 +214,7 @@
// 创建 POST 请求
HttpPost httpPost = new HttpPost("https://try.daowepark.com/v7/user_api/general/getBatterData");
// 设置请求体数据
- String postData = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id="+storeId+"&date_type=y"+"&year=";
+ String postData = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id="+storeId+"&date_type="+range+"&year=";
StringEntity entity = new StringEntity(postData, ContentType.APPLICATION_FORM_URLENCODED);
httpPost.setEntity(entity);
@@ -238,33 +238,7 @@
// 年度数据
result.put("yDataList", dataList);
}
- // 获取月度数据 (今年的十二个月数据)
- Calendar calendar = Calendar.getInstance();
- // 当前年份
- int year = calendar.get(Calendar.YEAR);
- // 月度数据
- // 创建 HttpClient 实例
- HttpClient httpClient1 = HttpClients.createDefault();
- // 创建 POST 请求
- HttpPost httpPost1 = new HttpPost("https://try.daowepark.com/v7/user_api/general/getBatterData");
- // 设置请求体数据
- String postData1 = "sign=0DB011836143EEE2C2E072967C9F4E4B&space_id=1001"+""+"&date_type=m"+"&year="+year;
- StringEntity entity1 = new StringEntity(postData1, ContentType.APPLICATION_FORM_URLENCODED);
- httpPost1.setEntity(entity1);
- // 执行请求
- HttpResponse response1 = httpClient1.execute(httpPost1);
- // 处理响应
- HttpEntity responseEntity1 = response1.getEntity();
- if (responseEntity1 != null) {
- String responseData1 = EntityUtils.toString(responseEntity1);
- ObjectMapper objectMapper = new ObjectMapper();
- Batter batter = objectMapper.readValue(responseData1, Batter.class);
- result.put("totalNumber", batter.getData().getAll_batter_num());
- result.put("totalTime", batter.getData().getAll_batter_time());
- List<BatterData> dataList = batter.getData().getList();
- // 月度数据
- result.put("mDataList", dataList);
- }
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -322,10 +296,10 @@
*/
@RequestMapping("/listSUTU1")
@ResponseBody
- public Object listSUTU1(String gameId, String time, String spaceId, String cityCode) {
+ public Object listSUTU1(String range,String gameId, String time, String spaceId, String cityCode) {
Map<String, Object> result = new HashMap<>();
try {
- String apiUrl = "https://try.daowepark.com/v7/user_api/general/getSingleGameData?game_id=" + gameId + "&date_type=" + "y" + "&date=" + "" + "&space_id=" + spaceId + "&city_code=" + cityCode;
+ String apiUrl = "https://try.daowepark.com/v7/user_api/general/getSingleGameData?game_id=" + gameId + "&date_type=" + range + "&date=" + time + "&space_id=" + spaceId + "&city_code=" + cityCode;
URL url = new URL(apiUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
@@ -352,42 +326,6 @@
}
result.put("data1", list);
result.put("years", years);
- String monthUrl = "";
- // 月度
- if (!time.contains("-")) {
- monthUrl = "https://try.daowepark.com/v7/user_api/general/getSingleGameData?game_id=" + gameId + "&date_type=" + "m" + "&date=" + time + "&space_id=" + spaceId + "&city_code=" + cityCode;
- } else {
- monthUrl = "https://try.daowepark.com/v7/user_api/general/getSingleGameData?game_id=" + gameId + "&date_type=" + "d" + "&date=" + time + "&space_id=" + spaceId + "&city_code=" + cityCode;
- }
- URL url1 = new URL(monthUrl);
- HttpURLConnection connection1 = (HttpURLConnection) url1.openConnection();
- connection1.setRequestMethod("GET");
- // 发送请求并获取响应
- int responseCode1 = connection1.getResponseCode();
- if (responseCode1 == HttpURLConnection.HTTP_OK) {
- BufferedReader reader1 = new BufferedReader(new InputStreamReader(connection1.getInputStream()));
- String line1;
- StringBuilder response1 = new StringBuilder();
- while ((line1 = reader1.readLine()) != null) {
- response1.append(line1);
- }
- reader1.close();
- // 处理响应数据
- String data1 = response1.toString();
- // 使用Jackson库将JSON字符串转换为Java对象
- ObjectMapper objectMapper1 = new ObjectMapper();
- SUTUOne res1 = objectMapper1.readValue(data1, SUTUOne.class);
- List<SUTUDataOne> list2 = res1.getData().getList();
- List<String> monthOrDays = new ArrayList<>();
- for (SUTUDataOne sutuDataOne : list2) {
- monthOrDays.add(sutuDataOne.getDate());
- }
- result.put("data2", list2);
- result.put("monthOrDays", monthOrDays);
- return result;
- } else {
- System.out.println("请求失败: " + responseCode1);
- }
}
return result;
} catch (ProtocolException e) {
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
index 491d757..137f39d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
@@ -57,7 +57,13 @@
</div>
</br>
<div class="col-sm-11">
+
<div class="form-group" style="display: flex;margin-left: -150px">
+ <label class="col-sm-3 control-label">*所属范围：</label>
+ <select style="width: 300px" class="form-control" id="range" name="range">
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ </select>
<label class="col-sm-3 control-label">*所属门店：</label>
<select style="width: 300px" class="form-control" id="stores" name="stores">
<option value="">全球</option>
@@ -90,6 +96,16 @@
</div>
</div>
<div class="col-sm-11" style="display: flex">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">*筛选范围：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="range1" name="range1" onchange="getStoreByCity(this)">
+ <option value="y">年度</option>
+ <option value="m">月度</option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选内容：</label>
<div class="col-sm-9" style="display: flex;">
@@ -109,6 +125,10 @@
</div>
</div>
+
+ </div>
+
+ <div class="col-sm-11" style="display: flex">
<div class="form-group" >
<label class="col-sm-3 control-label">*筛选场地：</label>
<div class="col-sm-9">
@@ -120,9 +140,7 @@
</select>
</div>
</div>
- </div>
-
- <div class="col-sm-11" style="display: flex">
+
<div class="form-group" >
<label class="col-sm-3 control-label">*游戏类型：</label>
<div class="col-sm-9">
@@ -311,32 +329,19 @@
data2=[];
data1=[];
var d1 = resp.data1;
- var d2 = resp.data2;
years = resp.years;
- monthOrDays = resp.monthOrDays;
+ if (years.length == 0){
+ years=[2020,2021,2022,2023]
+ }
for (let i = 0; i <d1.length; i++) {
data1.push(d1[i].count);
}
- for (let i = 0; i <d2.length; i++) {
- data2.push(d2[i].count);
+ if (d1.length==0){
+ data1= [0,0,0,0]
}
- console.log("看看data1")
- console.log(data1)
- console.log("看看data2")
- console.log(data2)
option4 = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -376,6 +381,7 @@
myChart4.setOption(option4);
})
ajax.set("gameId",$("#games").val())
+ ajax.set("range",$("#range1").val())
ajax.set("time",$("#con1").val())
ajax.set("spaceId",$("#site").val())
ajax.set("cityCode",$("#cCode").val())
@@ -387,7 +393,6 @@
};
function BatterData() {
var ajax = new $ax(Feng.ctxPath + "/gameData/list", function(resp){
- var mDataList= resp.mDataList;
var yDataList= resp.yDataList;
// 场次
yD=[];
@@ -399,10 +404,6 @@
for (let i = 0; i <yDataList.length ; i++) {
yD.push(yDataList[i].total_num);
yT.push(yDataList[i].batter_time);
- }
- for (let i = 0; i <mDataList.length ; i++) {
- mD.push(mDataList[i].total_num);
- mT.push(mDataList[i].batter_time);
}
for (let i = 0; i <resp.yearList.length ; i++) {
yearX.push(resp.yearList[i])
@@ -419,16 +420,6 @@
option = {
tooltip: {
trigger: 'axis'
- },
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
},
grid: {
left: '3%',
@@ -473,16 +464,6 @@
tooltip: {
trigger: 'axis'
},
- legend: {
- data: ['年度', '月度'],
- icon: 'stack',
- selectedMode: 'single', // 单选
- selected: {
- 年度: true,
- 月度: false,
-
- }
- },
grid: {
left: '3%',
right: '4%',
@@ -523,7 +504,7 @@
var myChart5 = echarts.init(document.getElementById('time'));
myChart5.setOption(option2);
});
-
+ ajax.set("range",$("#range").val());
ajax.set("storeId",$("#stores").val());
ajax.start();
}
--
Gitblit v1.7.1