From 068f7367353f9f20debc65ec4be2209ae3b90ecd Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 16:54:57 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 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 b9e6e5d..02219e6 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
@@ -19,15 +19,13 @@
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.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.validate.InsertGroup;
import com.ruoyi.system.api.validate.UpdateGroup;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.domain.dto.ResetPwdDTO;
-import com.ruoyi.system.domain.dto.SupplierDTO;
-import com.ruoyi.system.domain.dto.SupplierQuery;
-import com.ruoyi.system.domain.dto.SysUserDTO;
-import com.ruoyi.system.domain.dto.SysUserQuery;
+import com.ruoyi.system.domain.dto.*;
+import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
@@ -116,7 +114,7 @@
public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
user.setUserId(null);
- user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
+ user.setUserType(dto.getIsAuctioneer() == 1 ? "03" : "00");
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
@@ -125,7 +123,7 @@
return error("手机号已开通账号");
}
user.setCreateBy(SecurityUtils.getUsername());
- user.setPassword(SecurityUtils.encryptPassword("123456"));
+ user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setRoleType(1);
int i = userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
@@ -260,6 +258,12 @@
}
}
+ @PostMapping("/getUserSupplierList")
+ public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName()).like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone()));
+ return R.ok(list);
+ }
+
@PostMapping("/updateSysUser")
public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
try {
@@ -272,6 +276,7 @@
return R.ok();
}
}
+
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export")
@@ -374,7 +379,7 @@
@PostMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
- .in(SysUser::getUserType, "00", "01").one();
+ .in(SysUser::getUserType, "00", "02").one();
if (StringUtils.isNull(user)) {
throw new ServiceException("账号不存在");
}
@@ -571,6 +576,38 @@
return R.ok();
}
+
+ @ApiOperation(value = "获取管理员分页列表", notes = "获取管理员分页列表")
+ @PostMapping("/conservator-page")
+ public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
+ return R.ok(userService.getConservatorPage(query));
+ }
+
+ /**
+ * 添加/编辑供应商
+ *
+ * @param dto 供应商数据传输对象
+ */
+ @Log(title = "供应商管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "添加/编辑管理员", notes = "添加/编辑管理员")
+ @PostMapping("/save-conservator")
+ public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
+ userService.saveConservator(dto);
+ return R.ok();
+ }
+
+ /**
+ * 删除供应商
+ *
+ * @param id 供应商id
+ */
+ @ApiOperation(value = "删除供应商", notes = "删除供应商")
+ @DeleteMapping("/delete-conservator/{id}")
+ public R<?> deleteConservator(@PathVariable("id") Long id) {
+ userService.deleteConservator(id);
+ return R.ok();
+ }
+
@InnerAuth
@GetMapping("/list-by-name")
R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {
--
Gitblit v1.7.1