From c52f83ef5f702b3c178881d3eee72267c77e7751 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 24 七月 2024 17:26:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
index dab5f0c..fbf81e1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
@@ -22,6 +22,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IRegionService;
+import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.service.TOperatorService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
@@ -56,6 +57,12 @@
private String PREFIX = "/system/gateData/";
@Autowired
private TOperatorService operatorService;
+
+ @Autowired
+ private IStoreService storeService;
+
+
+
/**
* 跳转到充值记录页面
*/
@@ -63,6 +70,9 @@
public String index(Model model) {
List<TOperator> list = operatorService.list(new QueryWrapper<TOperator>().ne("state", 3));
model.addAttribute("list",list);
+ model.addAttribute("objectType", UserExt.getUser().getObjectType());
+ TStore tStore = storeService.getById(UserExt.getUser().getObjectId());
+ model.addAttribute("tStore", tStore);
return PREFIX + "GateData.html";
}
/**
@@ -73,7 +83,7 @@
public Object list(Integer storeId) {
try {
if (storeId!=null){
- String apiUrl = "https://try.daowepark.com/v7/user_api/general/spaceDoorData?space_id="+storeId;
+ String apiUrl = "https://port.daowepark.com/v7/user_api/general/spaceDoorData?space_id="+storeId;
URL url = new URL(apiUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
@@ -122,7 +132,7 @@
@ResponseBody
public Object totalNum(Integer storeId) {
try {
- String apiUrl = "https://try.daowepark.com/v7/user_api/general/spaceDoorData?space_id="+storeId;
+ String apiUrl = "https://port.daowepark.com/v7/user_api/general/spaceDoorData?space_id="+storeId;
URL url = new URL(apiUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET");
--
Gitblit v1.7.1