From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 149 ++++++++++++++++++++++++-------------------------
1 files changed, 74 insertions(+), 75 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..0664128 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
@@ -1,13 +1,8 @@
package com.dsh.guns.modular.system.controller.system;
import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -25,7 +20,6 @@
import com.dsh.guns.core.exception.GunsException;
import com.dsh.guns.core.log.LogObjectHolder;
import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.factory.UserFactory;
import com.dsh.guns.modular.system.model.Role;
@@ -33,6 +27,8 @@
import com.dsh.guns.modular.system.service.IRoleService;
import com.dsh.guns.modular.system.service.IUserService;
import com.dsh.guns.modular.system.transfer.UserDto;
+import com.dsh.guns.modular.system.util.OssUploadUtil;
+import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -40,10 +36,9 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import javax.naming.NoPermissionException;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.io.File;
import java.util.*;
/**
@@ -64,14 +59,9 @@
@Autowired
private IUserService userService;
- @Resource
- private DriverClient itDriverService;
-
@Autowired
private IRoleService roleService;
- @Resource
- private CompanyClient itCompanyService;
/**
@@ -89,6 +79,13 @@
@RequestMapping("/user_add")
public String addView(Model model) {
model.addAttribute("language",UserExt.getLanguage());
+ LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(UserExt.getUser().getObjectType()!=1){
+ roleLambdaQueryWrapper.eq(Role::getObjId,UserExt.getUser().getObjectId());
+ }
+ roleLambdaQueryWrapper.eq(Role::getObjType,UserExt.getUser().getObjectType());
+ List<Role> list = roleService.list(roleLambdaQueryWrapper);
+ model.addAttribute("list",list);
return PREFIX + "user_add.html";
}
@@ -123,6 +120,13 @@
model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
LogObjectHolder.me().set(user);
+ LambdaQueryWrapper<Role> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(UserExt.getUser().getObjectType()!=1){
+ roleLambdaQueryWrapper.eq(Role::getObjId,UserExt.getUser().getObjectId());
+ }
+ roleLambdaQueryWrapper.eq(Role::getObjType,UserExt.getUser().getObjectType());
+ List<Role> list = roleService.list(roleLambdaQueryWrapper);
+ model.addAttribute("list",list);
model.addAttribute("language",UserExt.getLanguage());
return PREFIX + "user_edit.html";
}
@@ -167,7 +171,6 @@
if (user.getPassword().equals(oldMd5)) {
String newMd5 = MD5.md5(newPwd);
user.setPassword(newMd5);
- user.setPassWordUpdate(new Date());
user.updateById();
return SUCCESS_TIP;
} else {
@@ -217,8 +220,13 @@
// 判断账号是否重复
//Check if the account is duplicated
- User theUser = userService.getByAccount(user.getAccount());
- if (theUser != null) {
+ User theUser = new User();
+ if (user.getAccount()!=""){
+ theUser = userService.getByAccount(user.getAccount());
+
+ }
+ System.out.println("=====theUser======="+theUser);
+ if (theUser != null&&user.getAccount()!="") {
throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
}
@@ -229,13 +237,13 @@
user.setCreatetime(new Date());
User objectUser = UserFactory.createUser(user);
+ objectUser.setObjectType(UserExt.getUser().getObjectType());
+ objectUser.setObjectId(UserExt.getUser().getObjectId());
+ objectUser.setRoleid(user.getRoleid());
+ objectUser.setAccount(user.getPhone());
+ objectUser.setPassword(SecureUtil.md5("a123456"));
//查找平台所属公司
//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 +356,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 +373,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;
}
@@ -439,21 +402,57 @@
/**
* 上传图片
*/
- @RequestMapping(method = RequestMethod.POST, path = "/upload")
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadImg")
@ResponseBody
- public String upload(@RequestPart("file") MultipartFile picture) {
-
- String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
+ public String uploadImg(@RequestPart("file") MultipartFile picture) {
+ String pictureName = "";
try {
- String fileSavePath = gunsProperties.getFileUploadPath();
- picture.transferTo(new File(fileSavePath + pictureName));
- } catch (Exception e) {
- throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
+ pictureName = OssUploadUtil.ossUpload("img/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
}
return pictureName;
}
/**
+ * 上传图片
+ */
+ /**
+ * 上传图片Amis
+ */
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadImgAmis")
+ @ResponseBody
+ public ResultUtil uploadImgAmis(@RequestPart("file") MultipartFile picture, HttpServletResponse response) {
+ String value = "";
+ try {
+ value = OssUploadUtil.ossUpload("img/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ System.out.println("图片返回地址-------"+value);
+ Map<String, String> map = new HashMap<>();
+ map.put("value",value);
+// return ResultUtil.success(0,map);
+ return ResultUtil.getResult(0,null,null,map);
+ }
+
+
+
+
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadFile")
+ @ResponseBody
+ public String uploadFile(@RequestPart("file") MultipartFile picture) {
+ String pictureName = "";
+ try {
+ pictureName = OssUploadUtil.ossUpload("video/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return pictureName;
+ }
+
+
+ /**
* 判断当前登录的用户是否有操作这个用户的权限
*/
private void assertAuth(Integer userId) {
--
Gitblit v1.7.1