From adc8542adeabbcbeff425d6471762c04e8f3cffe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 25 六月 2025 15:03:38 +0800
Subject: [PATCH] 修改功能和增加上传功能
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 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..71c0f6e 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
@@ -1,18 +1,16 @@
package com.stylefeng.guns.modular.system.controller.general;
-import com.alibaba.fastjson.JSON;
-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;
@@ -20,6 +18,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
@@ -36,28 +35,28 @@
@Autowired
private ITDriverService tDriverService;
-
+
@Autowired
private ITOrderTaxiService tOrderTaxiService;
-
+
@Autowired
private ITCarService tCarService;
-
+
@Autowired
private ITTaxiCardService taxiCardService;
-
- @Autowired
- private RedisUtil redisUtil;
-
+
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
@Autowired
private IUserService userService;
-
+
@Autowired
private ITCompanyService tCompanyService;
-
+
@Autowired
private ITCarBrandService carBrandService;
-
+
@Autowired
private ITCarModelService carModelService;
@@ -93,7 +92,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();
@@ -145,12 +144,6 @@
ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
}
List<TDriver> tDrivers = tDriverService.selectList(ne1);
- String keys = "";
- for(TDriver driver : tDrivers){
- keys += "DRIVER" + driver.getId() + ",";
- }
- String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
- JSONArray jsonArray = JSON.parseArray(value);
int size = driverOnlineService.queryOnlineDriverCount(null, null);
map1.put("netcardriver", size); //在线司机
@@ -223,7 +216,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,22 +384,24 @@
@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){
+ if (companyId == null && user.getRoleType() != 1) {
companyId = user.getObjectId();
}
Wrapper<TDriver> ne = new EntityWrapper<TDriver>().eq("authState", 2).eq("state", 2).ne("flag", 3);
- if(companyId != null){
+ if (companyId != null) {
ne.eq("companyId", companyId).or().eq("franchiseeId", companyId);
}
List<TDriver> tDrivers = tDriverService.selectList(ne);
Map<String, Object> map = new HashMap<>();
List<Object> list = new ArrayList<>();
- for(TDriver tDriver : tDrivers){
+ System.out.println(tDrivers.toString());
+ for (TDriver tDriver : tDrivers) {
Map<String, Object> d = new HashMap<>();
- String value = redisUtil.getValue("DRIVER" + tDriver.getId());
- if(ToolUtil.isEmpty(value)){
+ String value = (String) redisTemplate.opsForValue().get("DRIVER" + tDriver.getId());
+ System.out.println(value);
+ if (ToolUtil.isEmpty(value)) {
continue;
}
d.put("driver", tDriver);
@@ -460,7 +455,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