From 0e31bc6ea2f9e9ce9e3f8d8529e0f59ed0b22ed7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 02:26:22 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index a53827f..203479d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -4,15 +4,15 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
-import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +47,7 @@
private ITTaxiCardService taxiCardService;
@Autowired
- private RedisUtil redisUtil;
+ private RedisTemplate redisTemplate;
@Autowired
private IUserService userService;
@@ -93,7 +93,7 @@
@ResponseBody
@PostMapping("/getSumData")
public Object getSumData(Integer companyId, Date addDate, Date start, Date end){
- Integer id = ShiroKit.getUser().getId();
+ Integer id = ShiroExtUtil.getUser().getId();
User user = userService.selectById(id);
if(companyId == null && user.getRoleType() != 1){
companyId = user.getObjectId();
@@ -149,7 +149,7 @@
for(TDriver driver : tDrivers){
keys += "DRIVER" + driver.getId() + ",";
}
- String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
+ String value = (String)redisTemplate.opsForValue().get(keys.substring(0, keys.length() - 1));
JSONArray jsonArray = JSON.parseArray(value);
int size = driverOnlineService.queryOnlineDriverCount(null, null);
map1.put("netcardriver", size); //在线司机
@@ -223,7 +223,7 @@
Double allIncomeMoney = tOrderTaxiService.getAllIncomeMoney(companyId, null, null);
/// 购买打车卡产生的收益
- Double allCardMoney = taxiCardService.AllCardMoney(ShiroKit.getUser().getObjectId());
+ Double allCardMoney = taxiCardService.AllCardMoney(ShiroExtUtil.getUser().getObjectId());
if(allCardMoney==null){
allCardMoney=0.0;
}
@@ -391,7 +391,7 @@
@ResponseBody
@PostMapping("/getDriverPosition")
public Object getDriverPosition(Integer companyId){
- Integer id = ShiroKit.getUser().getId();
+ Integer id = ShiroExtUtil.getUser().getId();
User user = userService.selectById(id);
if(companyId == null && user.getRoleType() != 1){
companyId = user.getObjectId();
@@ -405,7 +405,7 @@
List<Object> list = new ArrayList<>();
for(TDriver tDriver : tDrivers){
Map<String, Object> d = new HashMap<>();
- String value = redisUtil.getValue("DRIVER" + tDriver.getId());
+ String value = (String)redisTemplate.opsForValue().get("DRIVER" + tDriver.getId());
if(ToolUtil.isEmpty(value)){
continue;
}
@@ -460,7 +460,7 @@
@ResponseBody
@PostMapping("/getCompanyInfoByUserId")
public Object getCompanyInfoByUserId(){
- Integer id = ShiroKit.getUser().getId();
+ Integer id = ShiroExtUtil.getUser().getId();
User user = userService.selectById(id);
companys = new ArrayList<>();
List<TCompany> ids = new ArrayList<>();
--
Gitblit v1.7.1