From f2530067b6cd16a87b76190cf524d2ed75bf9592 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:54 +0800
Subject: [PATCH] 集成中台及正联功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java
index 9191044..45879e4 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverBackController.java
@@ -101,12 +101,12 @@
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
model.addAttribute("companyList",companyList);
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType",roleType);
if (2 == roleType){
List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>()
.eq("type", 3)
- .eq("superiorId",ShiroKit.getUser().getObjectId())
+ .eq("superiorId",shiroExtUtil.getUser().getObjectId())
.notIn("state",1)
.notIn("flag",3));
model.addAttribute("franchiseeList",franchiseeList);
@@ -114,7 +114,7 @@
model.addAttribute("franchiseeList",null);
}
//查询当前用户所属分公司/加盟商
- model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+ model.addAttribute("objectName",tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
//查询线路列表
List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
@@ -172,9 +172,9 @@
model.addAttribute("item",tDriver);
LogObjectHolder.me().set(tDriver);
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType",roleType);
- model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+ model.addAttribute("objectName",tCompanyService.selectById(shiroExtUtil.getUser().getObjectId()).getName());
if (1 == roleType){
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
@@ -182,7 +182,7 @@
List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
model.addAttribute("franchiseeList",franchiseeList);
}else if (2 == roleType){
- List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",shiroExtUtil.getUser().getObjectId()));
model.addAttribute("franchiseeList",franchiseeList);
}
@@ -500,7 +500,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroKit.getUser().getRoleType() != 1){
+ if (shiroExtUtil.getUser().getRoleType() != 1){
page.setRecords(null);
}else{
page.setRecords(tDriverService.getAuthDriverList(page,beginTime,endTime,companyName,phone,account,addType,authState));
@@ -527,7 +527,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState));
+ page.setRecords(tDriverService.getDriverList(page,shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState));
return super.packForBT(page);
}
@@ -552,7 +552,7 @@
}*//*
//2020-08-21:新需求,已被绑定的车辆可以被继续绑定
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tDriverService.getCanSelectCarList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),null,carLicensePlate,brandName,modelName,color,serverStr));
+ page.setRecords(tDriverService.getCanSelectCarList(page,shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId(),null,carLicensePlate,brandName,modelName,color,serverStr));
return super.packForBT(page);
}
@@ -638,8 +638,8 @@
tDriver.setIsPlatCar(1);
tDriver.setAuthState(2);
}else if (2 == roleType){ //分公司
- if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(shiroExtUtil.getUser().getObjectId())){
+ tDriver.setCompanyId(shiroExtUtil.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
tDriver.setFranchiseeId(franchiseeId);
@@ -647,22 +647,22 @@
tDriver.setAddType(3);
tDriver.setIsPlatCar(2);
tDriver.setAuthState(1);
- tDriver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ tDriver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
}else if (3 == roleType){ //加盟商
- TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ TCompany tCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
if (SinataUtil.isNotEmpty(tCompany)){
tDriver.setCompanyId(tCompany.getSuperiorId());
}
- if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(shiroExtUtil.getUser().getObjectId())){
+ tDriver.setFranchiseeId(shiroExtUtil.getUser().getObjectId());
}
tDriver.setAddType(4);
tDriver.setIsPlatCar(2);
tDriver.setAuthState(1);
- tDriver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ tDriver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
}
tDriver.setInsertTime(new Date());
- tDriver.setInsertUser(ShiroKit.getUser().getId());
+ tDriver.setInsertUser(shiroExtUtil.getUser().getId());
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
@@ -784,23 +784,23 @@
tDriver.setFranchiseeId(franchiseeId);
}
}else if (2 == roleType){ //分公司
- if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(shiroExtUtil.getUser().getObjectId())){
+ tDriver.setCompanyId(shiroExtUtil.getUser().getObjectId());
}
if (SinataUtil.isNotEmpty(franchiseeId)){
tDriver.setFranchiseeId(franchiseeId);
}
}else if (3 == roleType){ //加盟商
- TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ TCompany tCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
if (SinataUtil.isNotEmpty(tCompany)){
tDriver.setCompanyId(tCompany.getSuperiorId());
}
- if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
- tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(shiroExtUtil.getUser().getObjectId())){
+ tDriver.setFranchiseeId(shiroExtUtil.getUser().getObjectId());
}
}
tDriver.setUpdateTime(new Date());
- tDriver.setUpdateUser(ShiroKit.getUser().getId());
+ tDriver.setUpdateUser(shiroExtUtil.getUser().getId());
// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
tDriverService.updateById(tDriver);
@@ -853,7 +853,7 @@
// 首行【封装】
List<String> shellList = new ArrayList<String>();
- if (ShiroKit.getUser().getRoleType() == 1){
+ if (shiroExtUtil.getUser().getRoleType() == 1){
title = "平台导入司机模板";
shellList.add("司机名称");
@@ -875,7 +875,7 @@
shellList.add("经营业务:包车[是/否]");
shellList.add("登录账号[手机号]");
shellList.add("登录密码[密码长度为6-18]");
- }else if (ShiroKit.getUser().getRoleType() == 2){
+ }else if (shiroExtUtil.getUser().getRoleType() == 2){
title = "分公司导入司机模板";
shellList.add("司机名称");
@@ -895,7 +895,7 @@
shellList.add("经营业务:包车[是/否]");
shellList.add("登录账号[手机号]");
shellList.add("登录密码[密码长度为6-18]");
- }else if (ShiroKit.getUser().getRoleType() == 3){
+ }else if (shiroExtUtil.getUser().getRoleType() == 3){
title = "加盟商导入司机模板";
shellList.add("司机名称");
@@ -936,7 +936,7 @@
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
try {
- if (ShiroKit.getUser().getRoleType() == 1){
+ if (shiroExtUtil.getUser().getRoleType() == 1){
Workbook book = WoUtil.ImportFile(file);
Sheet sh = book.getSheetAt(0); //获取到第一个表
for (int i = 1; i <= sh.getLastRowNum(); i++) {
@@ -1159,10 +1159,10 @@
driver.setState(2);
driver.setAuthState(2);
driver.setFlag("1");
- driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertUser(shiroExtUtil.getUser().getId());
driver.setInsertTime(new Date());
driver.setAddType(2);
- driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
if(SinataUtil.isNotEmpty(eight)){
driver.setDriverAddress(eight);
}
@@ -1213,7 +1213,7 @@
}
}
}
- }else if (ShiroKit.getUser().getRoleType() == 2){
+ }else if (shiroExtUtil.getUser().getRoleType() == 2){
Workbook book = WoUtil.ImportFile(file);
Sheet sh = book.getSheetAt(0); //获取到第一个表
for (int i = 1; i <= sh.getLastRowNum(); i++) {
@@ -1373,7 +1373,7 @@
return new ErrorTip(500, "登录密码格式不正确");
}
//查找平台公司
- Integer companyId = ShiroKit.getUser().getObjectId();
+ Integer companyId = shiroExtUtil.getUser().getObjectId();
Integer franchiseeId = 0;
//判断所属分公司是否存在
if (SinataUtil.isNotEmpty(one)){
@@ -1404,10 +1404,10 @@
driver.setState(1);
driver.setAuthState(1);
driver.setFlag("1");
- driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertUser(shiroExtUtil.getUser().getId());
driver.setInsertTime(new Date());
driver.setAddType(3);
- driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
if (SinataUtil.isNotEmpty(six)){
driver.setDriverAddress(six);
}
@@ -1458,7 +1458,7 @@
}
}
- }else if (ShiroKit.getUser().getRoleType() == 3){
+ }else if (shiroExtUtil.getUser().getRoleType() == 3){
Workbook book = WoUtil.ImportFile(file);
Sheet sh = book.getSheetAt(0); //获取到第一个表
for (int i = 1; i <= sh.getLastRowNum(); i++) {
@@ -1614,7 +1614,7 @@
//查找平台公司
Integer companyId = 0;
Integer franchiseeId = 0;
- TCompany franchisee = itCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ TCompany franchisee = itCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
if (SinataUtil.isNotEmpty(franchisee)){
companyId = franchisee.getSuperiorId();
franchiseeId = franchisee.getId();
@@ -1644,10 +1644,10 @@
driver.setState(1);
driver.setAuthState(1);
driver.setFlag("1");
- driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertUser(shiroExtUtil.getUser().getId());
driver.setInsertTime(new Date());
driver.setAddType(4);
- driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ driver.setAddObjectId(shiroExtUtil.getUser().getObjectId());
if (SinataUtil.isNotEmpty(five)){
driver.setDriverAddress(five);
}
@@ -1764,7 +1764,7 @@
*//*
@RequestMapping(value = "/outDriver")
public void outDriver(HttpServletRequest request, HttpServletResponse response) {
- List<Map<String,Object>> listMap = tDriverService.getDriverListNoPage(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId());
+ List<Map<String,Object>> listMap = tDriverService.getDriverListNoPage(shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId());
// 表格数据【封装】
List<List<String>> dataList = new ArrayList<>();
--
Gitblit v1.7.1