From 57a7c48cc4c81f7e9719c414e4abae942c93a21b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 15:13:37 +0800
Subject: [PATCH] 后台代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 68 ++--------------------------------
1 files changed, 4 insertions(+), 64 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 7f63b3a..0727730 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -2,12 +2,6 @@
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsh.course.feignClient.account.model.Company;
-import com.dsh.course.feignClient.activity.CompanyClient;
-import com.dsh.course.feignClient.activity.DriverClient;
-import com.dsh.course.feignClient.activity.model.CompanyInfoRes;
-import com.dsh.course.feignClient.activity.model.CompanyQueryStateAndFlgReq;
-import com.dsh.course.feignClient.activity.model.UpdateCompanyDriverReq;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.config.properties.GunsProperties;
@@ -40,11 +34,13 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import javax.naming.NoPermissionException;
import javax.validation.Valid;
import java.io.File;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
/**
* 系统管理员控制器
@@ -64,14 +60,9 @@
@Autowired
private IUserService userService;
- @Resource
- private DriverClient itDriverService;
-
@Autowired
private IRoleService roleService;
- @Resource
- private CompanyClient itCompanyService;
/**
@@ -167,7 +158,6 @@
if (user.getPassword().equals(oldMd5)) {
String newMd5 = MD5.md5(newPwd);
user.setPassword(newMd5);
- user.setPassWordUpdate(new Date());
user.updateById();
return SUCCESS_TIP;
} else {
@@ -231,11 +221,6 @@
User objectUser = UserFactory.createUser(user);
//查找平台所属公司
//Search for the company that owns the platform.
- Company company = itCompanyService.getCompanyByTypeAndFlag(new CompanyQueryStateAndFlgReq(1,3));
- if (SinataUtil.isNotEmpty(company)){
- objectUser.setObjectId(company.getId());
- }
- objectUser.setPassWordUpdate(new Date());
this.userService.save(objectUser);
return SUCCESS_TIP;
@@ -348,28 +333,6 @@
assertAuth(userId);
this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());
- User user = userService.getById(userId);
- if (user.getRoleType() == 2){
- //查询分公司 Query branch office
- CompanyInfoRes company = itCompanyService.queryById(user.getObjectId());
- company.setState(1);
- itCompanyService.updateCompany(company);
-
- //设置该分公司下的所有司机状态
- //Set the status of all drivers under this branch
- itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(3,company.getId()));
-
- }else if (user.getRoleType() == 3){
- //查询加盟商
- //Search for franchisees
- CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId());
- franchisee.setState(1);
- itCompanyService.updateCompany(franchisee);
-
- //设置该加盟商下的所有司机状态
- //Set the status of all drivers under this franchisee
- itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(3,franchisee.getId()));
- }
return SUCCESS_TIP;
}
@@ -387,29 +350,6 @@
assertAuth(userId);
this.userService.setStatus(userId, ManagerStatus.OK.getCode());
- User user = userService.getById(userId);
- if (user.getRoleType() == 2){
- //查询分公司
- //Query branch office
- CompanyInfoRes company = itCompanyService.queryById(user.getObjectId());
- company.setState(0);
- itCompanyService.updateCompany(company);
-
- //设置该分公司下的所有司机状态
- ////Set the status of all drivers under this branch
- itDriverService.updateCompanyDriverState(new UpdateCompanyDriverReq(2,company.getId()));
-
- }else if (user.getRoleType() == 3){
- //查询加盟商
- ////Search for franchisees
- CompanyInfoRes franchisee = itCompanyService.queryById(user.getObjectId());
- franchisee.setState(0);
- itCompanyService.updateCompany(franchisee);
-
- //设置该加盟商下的所有司机状态
- //Set the status of all drivers under this branch
- itDriverService.updateFranchiseeDriverState(new UpdateCompanyDriverReq(2,franchisee.getId()));
- }
return SUCCESS_TIP;
}
--
Gitblit v1.7.1