From 0d4f7cd29a978594453b102d4a767d64085df29d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 六月 2024 15:34:32 +0800
Subject: [PATCH] 提交【管理后台】-资讯管理相关代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 212 +++++++++++++++-------------------------------------
1 files changed, 61 insertions(+), 151 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 3201b9f..2fa729a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -16,14 +17,11 @@
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.CompanyAddSysUserDto;
-import com.ruoyi.system.api.model.CompanySysUserReq;
-import com.ruoyi.system.api.model.CompanyUserListVo;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.api.model.SysUserRoleDTO;
-import com.ruoyi.system.api.model.TRepairShopAdd;
-import com.ruoyi.system.api.model.TRepairShopAddDto;
import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.domain.dto.SupplierDTO;
+import com.ruoyi.system.domain.dto.SupplierQuery;
+import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPermissionService;
@@ -34,7 +32,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -228,53 +225,7 @@
return R.ok(list);
}
- @PostMapping("/getSysUserFromCompanyId")
- public R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq) {
- LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (companySysUserReq.getUserIds().size() == 0) {
- List<Integer> userIds = companySysUserReq.getUserIds();
- userIds.add(-1);
- companySysUserReq.setUserIds(userIds);
- }
- sysUserLambdaQueryWrapper.in(SysUser::getUserId, companySysUserReq.getUserIds());
- if (companySysUserReq.getName() != null && !"".equals(companySysUserReq.getName())) {
- sysUserLambdaQueryWrapper.like(SysUser::getUserName, companySysUserReq.getName()).or().like(SysUser::getPhonenumber, companySysUserReq.getName());
- }
- sysUserLambdaQueryWrapper.eq(SysUser::getRoleType,2);
- List<SysUser> list = userService.list(sysUserLambdaQueryWrapper);
- ArrayList<CompanyUserListVo> companyUserListVos = new ArrayList<>();
- for (SysUser sysUser : list) {
- CompanyUserListVo companyUserListVo = new CompanyUserListVo();
- companyUserListVo.setId(sysUser.getUserId());
- companyUserListVo.setPassword(sysUser.getPassword());
- companyUserListVo.setPhoneNumber(sysUser.getPhonenumber());
- companyUserListVo.setUserName(sysUser.getUserName());
- companyUserListVo.setNickName(sysUser.getNickName());
- companyUserListVos.add(companyUserListVo);
- }
- return R.ok(companyUserListVos);
- }
- @PostMapping("/getSysUserFromCompanyIdOne")
- public R<List<CompanyUserListVo>> getSysUserFromCompanyIdOne(@RequestBody CompanySysUserReq companySysUserReq) {
- LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- sysUserLambdaQueryWrapper.eq(SysUser::getRoleType, 2);
- if (companySysUserReq.getName() != null && !"".equals(companySysUserReq.getName())) {
- sysUserLambdaQueryWrapper.like(SysUser::getPhonenumber, companySysUserReq.getName());
- }
- List<SysUser> list = userService.list(sysUserLambdaQueryWrapper);
- ArrayList<CompanyUserListVo> companyUserListVos = new ArrayList<>();
- for (SysUser sysUser : list) {
- CompanyUserListVo companyUserListVo = new CompanyUserListVo();
- companyUserListVo.setId(sysUser.getUserId());
- companyUserListVo.setPassword(sysUser.getPassword());
- companyUserListVo.setPhoneNumber(sysUser.getPhonenumber());
- companyUserListVo.setUserName(sysUser.getUserName());
- companyUserListVo.setNickName(sysUser.getNickName());
- companyUserListVos.add(companyUserListVo);
- }
- return R.ok(companyUserListVos);
- }
@PostMapping("/isAdmin")
public R<Integer> isAdmin(@RequestBody Long userId){
SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
@@ -305,86 +256,6 @@
return R.ok();
}
}
-
-
- @PostMapping("/companySaveSysUser")
- public R<List<Integer>> companySaveSysUser(@RequestBody CompanyAddSysUserDto dto) {
- List<CompanyUserListVo> list = dto.getList();
- ArrayList<Integer> userIds = new ArrayList<>();
- try {
- for (CompanyUserListVo companyUserListVo : list) {
- List<Long> ids = userService.getSysUserFromPhone(companyUserListVo.getPhoneNumber());
- SysUser sysUser = new SysUser();
- if (ids.size() > 0) {
- sysUser.setRoleType(2);
- sysUser.setObjectId(dto.getCompanyId());
- if(companyUserListVo.getPassword()!=null){
- sysUser.setPassword(SecurityUtils.encryptPassword(companyUserListVo.getPassword()));
- }
- sysUser.setPhonenumber(companyUserListVo.getPhoneNumber());
- sysUser.setUserName(companyUserListVo.getPhoneNumber());
- sysUser.setNickName(companyUserListVo.getNickName());
- sysUser.setUserId(ids.get(0).longValue());
- userService.updateUser(sysUser);
- userIds.add(ids.get(0).intValue());
- } else {
-
- sysUser.setRoleType(2);
- sysUser.setObjectId(dto.getCompanyId());
- if(companyUserListVo.getPassword()!=null){
- sysUser.setPassword(SecurityUtils.encryptPassword(companyUserListVo.getPassword()));
- }
- sysUser.setPhonenumber(companyUserListVo.getPhoneNumber());
- sysUser.setUserName(companyUserListVo.getPhoneNumber());
- sysUser.setNickName(companyUserListVo.getNickName());
- sysUser.setCreateBy(SecurityUtils.getUsername());
- sysUser.setCreateTime(new Date());
- userService.insertUser(sysUser);
- SysUserRole sysUserRole = new SysUserRole();
- sysUserRole.setRoleId(20l);
- sysUserRole.setUserId(sysUser.getUserId());
- sysUserRoleService.insertSysUserRole(sysUserRole);
- userIds.add(sysUser.getUserId().intValue());
- }
- }
- return R.ok(userIds);
- } catch (Exception e) {
- e.printStackTrace();
- return R.ok(new ArrayList<>());
- }
- }
-
-
- @PostMapping("/addTRepairSysUser")
- public R<List<Integer>> addTRepairSysUser(@RequestBody TRepairShopAddDto dto) {
- List<TRepairShopAdd> list = dto.getList();
- ArrayList<Integer> userIds = new ArrayList<>();
- try {
- for (TRepairShopAdd add : list) {
- List<Long> ids = userService.getSysUserFromPhone(add.getPhonenumber());
- if (ids.size() > 0) {
- userIds.add(ids.get(0).intValue());
- } else {
- SysUser sysUser = new SysUser();
- sysUser.setPhonenumber(add.getPhonenumber());
- sysUser.setCreateTime(new Date());
- sysUser.setCreateBy(SecurityUtils.getUsername());
- sysUser.setPassword(SecurityUtils.encryptPassword(add.getPwd()));
- sysUser.setRoleType(4);
- sysUser.setObjectId(dto.getRepairId());
- sysUser.setUserName(add.getPhonenumber());
- sysUser.setNickName(add.getPhonenumber());
- userService.insertUser(sysUser);
- userIds.add(sysUser.getUserId().intValue());
- }
- }
- return R.ok(userIds);
- } catch (Exception e) {
- e.printStackTrace();
- return R.ok(new ArrayList<>());
- }
- }
-
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export")
@@ -439,7 +310,7 @@
*/
@InnerAuth
@PostMapping("/register")
- public R<Boolean> register(@RequestBody SysUser sysUser) {
+ public R<SysUser> register(@RequestBody SysUser sysUser) {
String username = sysUser.getUserName();
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return R.fail("当前系统没有开启注册功能！");
@@ -449,6 +320,13 @@
}
return R.ok(userService.registerUser(sysUser));
}
+
+ @PostMapping("/registerUser")
+ public R<SysUser> registerUser(@RequestBody SysUser sysUser){
+ sysUser = userService.registerUser(sysUser);
+ return R.ok(sysUser);
+ }
+
/**
* 获取用户信息
@@ -597,23 +475,6 @@
}
/**
- * 默认批量添加修理厂
- * @param dtoList
- * @return
- */
- @PostMapping("/addUserRole")
- public R<Boolean> addUserRole(@RequestBody List<SysUserRoleDTO> dtoList){
- List<SysUserRole> userRoles = new ArrayList<>();
- for (SysUserRoleDTO userRoleDTO : dtoList) {
- SysUserRole userRole = new SysUserRole();
- userRole.setRoleId(userRoleDTO.getRoleId());
- userRole.setUserId(userRoleDTO.getUserId());
- userRoles.add(userRole);
- }
- return R.ok(sysUserRoleService.saveBatch(userRoles));
- }
-
- /**
* 通过手机号查询用户
* @param phone
* @return
@@ -640,4 +501,53 @@
return R.ok(user);
}
+ /**
+ * 获取供应商分页列表
+ *
+ * @param query 供应商列表查询数据传输对象
+ * @return PageDTO<SupplyUserVO>
+ */
+ @ApiOperation(value = "获取供应商分页列表", notes = "获取供应商分页列表")
+ @PostMapping("/supplier-page")
+ public R<PageDTO<SupplierVO>> getSupplierPage(@Validated @RequestBody SupplierQuery query) {
+ return R.ok(userService.getSupplierPage(query));
+ }
+
+ /**
+ * 添加/编辑供应商
+ *
+ * @param dto 供应商数据传输对象
+ */
+ @Log(title = "供应商管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "添加/编辑供应商", notes = "添加/编辑供应商")
+ @PostMapping("/save-supplier")
+ public R<?> saveSupplier(@Validated @RequestBody SupplierDTO dto) {
+ userService.saveSupplier(dto);
+ return R.ok();
+ }
+
+ /**
+ * 删除供应商
+ *
+ * @param id 供应商id
+ */
+ @ApiOperation(value = "删除供应商", notes = "删除供应商")
+ @DeleteMapping("/delete-supplier/{id}")
+ public R<?> deleteSupplier(@PathVariable("id") Long id) {
+ userService.deleteSupplier(id);
+ return R.ok();
+ }
+
+ @InnerAuth
+ @GetMapping("/list-by-name")
+ R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {
+ List<SysUser> list = userService.lambdaQuery()
+ .like(StringUtils.isNotBlank(sysUser.getNickName()), SysUser::getNickName,
+ sysUser.getNickName())
+ .like(StringUtils.isNotBlank(sysUser.getPhonenumber()), SysUser::getPhonenumber,
+ sysUser.getPhonenumber())
+ .eq(SysUser::getUserType, "00")
+ .eq(SysUser::getDelFlag, 0).list();
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1