fangqiao/qiaoba-boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
ailanyin
2023-07-10 17:40:14 +08:00
parent d52133394c
commit 373754c2bb
41 changed files with 413 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysConfigController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysConfig;
import com.qiaoba.api.system.entity.param.SysConfigParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -15,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -24,6 +27,7 @@ import java.util.List;
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Validated
@RestController
@RequestMapping("/system/config")
@RequiredArgsConstructor
@ -35,14 +39,14 @@ public class SysConfigController {
@PreAuthorize("hasAuthority('system:config:list')")
@GetMapping("/list")
@Operation(summary = "获取列表")
public TableDataInfo list(SysConfigParam param, PageQuery pageQuery) {
public TableDataInfo list(@Validated SysConfigParam param, PageQuery pageQuery) {
return sysConfigService.selectPageList(param, pageQuery);
}
@PreAuthorize("hasAuthority('system:config:export')")
@PostMapping("/export")
@Operation(summary = "导出数据")
public void export(HttpServletResponse response, SysConfigParam param) throws Exception {
public void export(@Validated HttpServletResponse response, SysConfigParam param) {
List<SysConfig> list = sysConfigService.selectList(param);
ExcelUtil.exportExcel(list, SysConfig.class, "参数数据", response);
}
@ -50,7 +54,7 @@ public class SysConfigController {
@PreAuthorize("hasAuthority('system:config:query')")
@GetMapping(value = "/{configId}")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@PathVariable String configId) {
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法") @PathVariable String configId) {
return AjaxResult.success(sysConfigService.selectById(configId));
}
@ -63,14 +67,14 @@ public class SysConfigController {
@PreAuthorize("hasAuthority('system:config:add')")
@PostMapping
@Operation(summary = "新增配置")
public AjaxResult add(@Validated @RequestBody SysConfig config) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysConfig config) {
return AjaxResult.toAjax(sysConfigService.insert(config));
}
@PreAuthorize("hasAuthority('system:config:edit')")
@PutMapping
@Operation(summary = "修改配置")
public AjaxResult edit(@Validated @RequestBody SysConfig config) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysConfig config) {
return AjaxResult.toAjax(sysConfigService.updateById(config));
}

61
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDeptController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysDept;
import com.qiaoba.api.system.entity.param.SysDeptParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.module.system.service.SysDeptService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -11,6 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -20,6 +23,7 @@ import java.util.List;
* @version 1.0
* @since 2023/5/6 15:06
*/
@Validated
@RestController
@RequestMapping("/system/dept")
@Tag(name = "部门管理")
@ -31,10 +35,38 @@ public class SysDeptController {
@PreAuthorize("hasAuthority('system:dept:list')")
@GetMapping("/list")
@Operation(summary = "获取列表")
public AjaxResult list(SysDeptParam param) {
public AjaxResult list(@Validated SysDeptParam param) {
return AjaxResult.success(sysDeptService.selectList(param));
}
@PreAuthorize("hasAuthority('system:dept:query')")
@GetMapping(value = "/{deptId}")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法") @PathVariable String deptId) {
return AjaxResult.success(sysDeptService.selectById(deptId));
}
@PreAuthorize("hasAuthority('system:dept:add')")
@PostMapping
@Operation(summary = "新增部门")
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysDept dept) {
return AjaxResult.toAjax(sysDeptService.insert(dept));
}
@PreAuthorize("hasAuthority('system:dept:edit')")
@PutMapping
@Operation(summary = "修改部门")
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysDept dept) {
return AjaxResult.toAjax(sysDeptService.updateById(dept));
}
@PreAuthorize("hasAuthority('system:dept:remove')")
@DeleteMapping("/{id}")
@Operation(summary = "删除部门")
public AjaxResult remove(@PathVariable String id) {
return AjaxResult.toAjax(sysDeptService.deleteById(id));
}
@PreAuthorize("hasAuthority('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
@Operation(summary = "查询部门列表(排除节点)")
@ -42,13 +74,6 @@ public class SysDeptController {
return AjaxResult.success(sysDeptService.excludeChild(deptId));
}
@PreAuthorize("hasAuthority('system:dept:query')")
@GetMapping(value = "/{deptId}")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@PathVariable String deptId) {
return AjaxResult.success(sysDeptService.selectById(deptId));
}
@GetMapping("/dept-tree")
@Operation(summary = "构建部门树")
public AjaxResult deptTree(SysDeptParam param) {
@ -65,24 +90,4 @@ public class SysDeptController {
return ajax;
}
@PreAuthorize("hasAuthority('system:dept:add')")
@PostMapping
@Operation(summary = "新增部门")
public AjaxResult add(@Validated @RequestBody SysDept dept) {
return AjaxResult.toAjax(sysDeptService.insert(dept));
}
@PreAuthorize("hasAuthority('system:dept:edit')")
@PutMapping
@Operation(summary = "修改部门")
public AjaxResult edit(@Validated @RequestBody SysDept dept) {
return AjaxResult.toAjax(sysDeptService.updateById(dept));
}
@PreAuthorize("hasAuthority('system:dept:remove')")
@DeleteMapping("/{id}")
@Operation(summary = "删除部门")
public AjaxResult remove(@PathVariable String id) {
return AjaxResult.toAjax(sysDeptService.deleteById(id));
}
}

16
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictDataController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysDictData;
import com.qiaoba.api.system.entity.param.SysDictDataParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -22,6 +25,7 @@ import java.util.List;
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Validated
@RestController
@RequestMapping("/system/dict/data")
@RequiredArgsConstructor
@ -31,37 +35,37 @@ public class SysDictDataController {
@PreAuthorize("hasAuthority('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictDataParam param, PageQuery pageQuery) {
public TableDataInfo list(@Validated SysDictDataParam param, PageQuery pageQuery) {
return sysDictDataService.selectPageList(param, pageQuery);
}
@PreAuthorize("hasAuthority('system:dict:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictDataParam param) {
public void export(HttpServletResponse response, @Validated SysDictDataParam param) {
List<SysDictData> list = sysDictDataService.selectList(param);
ExcelUtil.exportExcel(list, SysDictData.class, "字典数据", response);
}
@PreAuthorize("hasAuthority('system:dict:query')")
@GetMapping(value = "/{dictCode}")
public AjaxResult getInfo(@PathVariable String dictCode) {
public AjaxResult getInfo(@Size(max = 30, message = "dictCode不合法") @PathVariable String dictCode) {
return AjaxResult.success(sysDictDataService.selectById(dictCode));
}
@GetMapping(value = "/type/{dictType}")
public AjaxResult dictType(@PathVariable String dictType) {
public AjaxResult dictType(@Size(max = 30, message = "dictType不合法") @PathVariable String dictType) {
return AjaxResult.success(sysDictDataService.selectFromCache(dictType));
}
@PreAuthorize("hasAuthority('system:dict:add')")
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData sysDictData) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysDictData sysDictData) {
return AjaxResult.toAjax(sysDictDataService.insert(sysDictData));
}
@PreAuthorize("hasAuthority('system:dict:edit')")
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData sysDictData) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysDictData sysDictData) {
return AjaxResult.toAjax(sysDictDataService.update(sysDictData));
}

15
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysDictType;
import com.qiaoba.api.system.entity.param.SysDictTypeParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -10,9 +12,11 @@ import com.qiaoba.module.system.service.SysDictDataService;
import com.qiaoba.module.system.service.SysDictTypeService;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -22,6 +26,7 @@ import java.util.List;
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Validated
@RestController
@RequestMapping("/system/dict/type")
@RequiredArgsConstructor
@ -33,32 +38,32 @@ public class SysDictTypeController {
@PreAuthorize("hasAuthority('system:dict:list')")
@GetMapping("/list")
public TableDataInfo list(SysDictTypeParam param, PageQuery pageQuery) {
public TableDataInfo list(@Validated SysDictTypeParam param, PageQuery pageQuery) {
return sysDictTypeService.selectPageList(param, pageQuery);
}
@PreAuthorize("hasAuthority('system:dict:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictTypeParam param) throws Exception {
public void export(HttpServletResponse response, @Validated SysDictTypeParam param) {
List<SysDictType> list = sysDictTypeService.selectList(param);
ExcelUtil.exportExcel(list, SysDictType.class, "字典类型", response);
}
@PreAuthorize("hasAuthority('system:dict:query')")
@GetMapping(value = "/{dictId}")
public AjaxResult getInfo(@PathVariable String dictId) {
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法") @PathVariable String dictId) {
return AjaxResult.success(sysDictTypeService.selectById(dictId));
}
@PreAuthorize("hasAuthority('system:dict:add')")
@PostMapping
public AjaxResult add(@RequestBody SysDictType sysDictType) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysDictType sysDictType) {
return AjaxResult.toAjax(sysDictTypeService.insert(sysDictType));
}
@PreAuthorize("hasAuthority('system:dict:edit')")
@PutMapping
public AjaxResult edit(@RequestBody SysDictType sysDictType) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysDictType sysDictType) {
return AjaxResult.toAjax(sysDictTypeService.update(sysDictType));
}

12
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.param.SysMenuParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.module.system.service.SysMenuService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -11,6 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -20,6 +23,7 @@ import java.util.List;
* @version 1.0
* @since 2023/5/5 10:06
*/
@Validated
@RestController
@RequestMapping("/system/menu")
@RequiredArgsConstructor
@ -30,7 +34,7 @@ public class SysMenuController {
@GetMapping("/list")
@Operation(summary = "获取列表")
public AjaxResult list(SysMenuParam param) {
public AjaxResult list(@Validated SysMenuParam param) {
List<SysMenu> menus = sysMenuService.selectList(param);
return AjaxResult.success(menus);
}
@ -38,21 +42,21 @@ public class SysMenuController {
@PreAuthorize("hasAuthority('system:menu:query')")
@GetMapping(value = "/{menuId}")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@PathVariable String menuId) {
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法")@PathVariable String menuId) {
return AjaxResult.success(sysMenuService.selectById(menuId));
}
@PreAuthorize("hasAuthority('system:menu:add')")
@PostMapping
@Operation(summary = "添加菜单")
public AjaxResult add(@Validated @RequestBody SysMenu menu) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysMenu menu) {
return AjaxResult.toAjax(sysMenuService.insert(menu));
}
@PreAuthorize("hasAuthority('system:menu:edit')")
@PutMapping
@Operation(summary = "修改菜单")
public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysMenu menu) {
return AjaxResult.toAjax(sysMenuService.updateById(menu));
}

14
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysPostController.java
View File

@ -3,6 +3,8 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysPost;
import com.qiaoba.api.system.entity.param.SysPostParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -15,6 +17,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -24,6 +27,7 @@ import java.util.List;
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Validated
@RestController
@RequestMapping("/system/post")
@RequiredArgsConstructor
@ -35,14 +39,14 @@ public class SysPostController {
@GetMapping("/list")
@PreAuthorize("hasAuthority('system:post:list')")
@Operation(summary = "获取列表")
public TableDataInfo<SysPost> list(SysPostParam param, PageQuery pageQuery) {
public TableDataInfo<SysPost> list(@Validated SysPostParam param, PageQuery pageQuery) {
return sysPostService.selectPageList(param, pageQuery);
}
@PostMapping("/export")
@PreAuthorize("hasAuthority('system:post:export')")
@Operation(summary = "导出岗位")
public void export(HttpServletResponse response, SysPostParam param) {
public void export(HttpServletResponse response, @Validated SysPostParam param) {
List<SysPost> list = sysPostService.selectList(param);
ExcelUtil.exportExcel(list, SysPost.class, "岗位数据", response);
}
@ -50,21 +54,21 @@ public class SysPostController {
@GetMapping(value = "/{postId}")
@PreAuthorize("hasAuthority('system:post:query')")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@PathVariable("postId") String postId) {
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法") @PathVariable("postId") String postId) {
return AjaxResult.success(sysPostService.selectById(postId));
}
@PostMapping
@PreAuthorize("hasAuthority('system:post:add')")
@Operation(summary = "新增岗位")
public AjaxResult add(@Validated @RequestBody SysPost post) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysPost post) {
return AjaxResult.toAjax(sysPostService.insert(post));
}
@PutMapping
@PreAuthorize("hasAuthority('system:post:edit')")
@Operation(summary = "修改岗位")
public AjaxResult edit(@Validated @RequestBody SysPost post) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysPost post) {
return AjaxResult.toAjax(sysPostService.updateById(post));
}

14
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysRoleController.java
View File

@ -6,6 +6,8 @@ import com.qiaoba.api.system.entity.dto.SysRoleDto;
import com.qiaoba.api.system.entity.param.SysRoleParam;
import com.qiaoba.api.system.entity.param.SysUserParam;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -20,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.List;
/**
@ -29,6 +32,7 @@ import java.util.List;
* @version 1.0
* @since 2022-09-22 04:20:28
*/
@Validated
@RestController
@RequestMapping("/system/role")
@RequiredArgsConstructor
@ -42,14 +46,14 @@ public class SysRoleController {
@PreAuthorize("hasAuthority('system:role:list')")
@GetMapping("/list")
@Operation(summary = "获取列表")
public TableDataInfo<SysRole> list(SysRoleParam param, PageQuery pageQuery) {
public TableDataInfo<SysRole> list(@Validated SysRoleParam param, PageQuery pageQuery) {
return sysRoleService.selectPageList(param, pageQuery);
}
@PreAuthorize("hasAuthority('system:role:export')")
@PostMapping("/export")
@Operation(summary = "导出列表")
public void export(HttpServletResponse response, SysRoleParam param) throws Exception {
public void export(HttpServletResponse response, @Validated SysRoleParam param) {
List<SysRole> list = sysRoleService.selectList(param);
ExcelUtil.exportExcel(list, SysRole.class, "角色数据", response);
}
@ -57,14 +61,14 @@ public class SysRoleController {
@PreAuthorize("hasAuthority('system:role:query')")
@GetMapping(value = "/{roleId}")
@Operation(summary = "获取详情")
public AjaxResult getInfo(@PathVariable String roleId) {
public AjaxResult getInfo(@Size(min = 19, max = 20, message = "ID不合法") @PathVariable String roleId) {
return AjaxResult.success(sysRoleService.selectById(roleId));
}
@PreAuthorize("hasAuthority('system:role:add')")
@PostMapping
@Operation(summary = "添加角色")
public AjaxResult add(@Validated @RequestBody SysRoleDto roleDto) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysRoleDto roleDto) {
return AjaxResult.toAjax(sysRoleService.insert(roleDto));
}
@ -72,7 +76,7 @@ public class SysRoleController {
@PreAuthorize("hasAuthority('system:role:edit')")
@PutMapping
@Operation(summary = "修改角色")
public AjaxResult edit(@Validated @RequestBody SysRoleDto roleDto) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysRoleDto roleDto) {
return AjaxResult.toAjax(sysRoleService.updateById(roleDto));
}

9
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysUserController.java
View File

@ -14,6 +14,8 @@ import com.qiaoba.api.system.entity.vo.SysUserVo;
import com.qiaoba.api.auth.utils.SecurityUtil;
import com.qiaoba.common.base.enums.BaseEnum;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.common.base.validate.AddGroup;
import com.qiaoba.common.base.validate.EditGroup;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
import com.qiaoba.common.poi.utils.ExcelUtil;
@ -41,6 +43,7 @@ import java.util.stream.Collectors;
* @version 1.0
* @since 2023-04-23 20:51:26
*/
@Validated
@RestController
@RequestMapping("/system/user")
@Tag(name = "用户管理")
@ -57,21 +60,21 @@ public class SysUserController {
@PreAuthorize("hasAuthority('system:user:add')")
@PostMapping
@Operation(summary = "新增用户")
public AjaxResult add(@Validated @RequestBody SysUserDto dto) {
public AjaxResult add(@Validated(AddGroup.class) @RequestBody SysUserDto dto) {
return AjaxResult.toAjax(sysUserService.saveOrUpdate(dto, false));
}
@PreAuthorize("hasAuthority('system:user:edit')")
@PutMapping
@Operation(summary = "修改用户")
public AjaxResult edit(@Validated @RequestBody SysUserDto dto) {
public AjaxResult edit(@Validated(EditGroup.class) @RequestBody SysUserDto dto) {
return AjaxResult.toAjax(sysUserService.saveOrUpdate(dto, true));
}
@PreAuthorize("hasAuthority('system:user:resetPwd')")
@PutMapping("/resetPwd")
@Operation(summary = "重置密码")
public AjaxResult resetPwd(@RequestBody ResetPasswordDto dto) {
public AjaxResult resetPwd(@Validated @RequestBody ResetPasswordDto dto) {
SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class);
sysUser.setPassword(SecurityUtil.encryptPassword(dto.getPassword()));
return AjaxResult.toAjax(sysUserService.updateById(sysUser));

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysDeptMapper.java
View File

@ -22,7 +22,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
* @return 结果
*/
@SelectOneRow
int checkDeptNameUnique(SysDept dept);
String checkDeptNameUnique(SysDept dept);
/**
* 根据角色ID查询部门树信息

6
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysUserMapper.java
View File

@ -27,7 +27,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return count
*/
@SelectOneRow
int checkUsernameUnique(SysUser sysUser);
String checkUsernameUnique(SysUser sysUser);
/**
* 校验手机号码是否唯一
@ -36,7 +36,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return count
*/
@SelectOneRow
int checkPhoneUnique(SysUser sysUser);
String checkPhoneUnique(SysUser sysUser);
/**
* 校验email是否唯一
@ -45,7 +45,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return count
*/
@SelectOneRow
int checkEmailUnique(SysUser sysUser);
String checkEmailUnique(SysUser sysUser);
/**
* 分页查询用户列表

3
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysConfigServiceImpl.java
View File

@ -53,6 +53,8 @@ public class SysConfigServiceImpl implements SysConfigService {
@Override
public int updateById(SysConfig sysConfig) {
checkKeyIsExist(sysConfig);
// key 禁止修改
sysConfig.setConfigKey(null);
sysConfig.setUpdateTime(new Date());
sysConfig.setUpdateUser(SecurityUtil.getLoginUsername());
int result = sysConfigMapper.updateById(sysConfig);
@ -118,6 +120,7 @@ public class SysConfigServiceImpl implements SysConfigService {
private QueryWrapper<SysConfig> param2Wrapper(SysConfigParam param) {
QueryWrapper<SysConfig> wrapper = new QueryWrapper<>();
wrapper.lambda()
.orderByDesc(SysConfig::getCreateTime)
.like(StrUtil.isNotBlank(param.getConfigName()), SysConfig::getConfigName, param.getConfigName())
.like(StrUtil.isNotBlank(param.getConfigKey()), SysConfig::getConfigKey, param.getConfigKey())
.eq(StrUtil.isNotBlank(param.getConfigType()), SysConfig::getConfigType, param.getConfigType());

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDeptServiceImpl.java
View File

@ -137,7 +137,7 @@ public class SysDeptServiceImpl implements SysDeptService {
}
private boolean checkDeptNameNotUnique(SysDept dept) {
return sysDeptMapper.checkDeptNameUnique(dept) > 0;
return StrUtil.isNotBlank(sysDeptMapper.checkDeptNameUnique(dept));
}
/**

1
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -85,6 +85,7 @@ public class SysDictTypeServiceImpl implements SysDictTypeService {
private QueryWrapper<SysDictType> param2Wrapper(SysDictTypeParam param) {
QueryWrapper<SysDictType> wrapper = new QueryWrapper<>();
wrapper.lambda()
.orderByDesc(SysDictType::getCreateTime)
.like(StrUtil.isNotBlank(param.getDictName()), SysDictType::getDictName, param.getDictName())
.like(StrUtil.isNotBlank(param.getDictType()), SysDictType::getDictType, param.getDictType())
.eq(StrUtil.isNotBlank(param.getStatus()), SysDictType::getStatus, param.getStatus());

12
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java
View File

@ -6,14 +6,14 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.qiaoba.api.auth.annotation.DataScope;
import com.qiaoba.api.auth.utils.SecurityUtil;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.api.system.entity.SysUserPost;
import com.qiaoba.api.system.entity.SysUserRole;
import com.qiaoba.api.system.entity.dto.SysUserDto;
import com.qiaoba.api.system.entity.param.SysUserParam;
import com.qiaoba.api.system.entity.vo.SysUserVo;
import com.qiaoba.api.auth.annotation.DataScope;
import com.qiaoba.api.auth.utils.SecurityUtil;
import com.qiaoba.common.base.exceptions.ServiceException;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;
@ -171,6 +171,8 @@ public class SysUserServiceImpl implements SysUserService {
}
SysUser sysUser = BeanUtil.copyProperties(dto, SysUser.class);
if (isUpdate) {
sysUser.setUsername(null);
sysUser.setPassword(null);
sysUser.setUpdateTime(new Date());
sysUser.setUpdateUser(SecurityUtil.getLoginUsername());
} else {
@ -200,7 +202,7 @@ public class SysUserServiceImpl implements SysUserService {
* @return 结果
*/
private boolean checkUsernameNotUnique(SysUser sysUser) {
return sysUserMapper.checkUsernameUnique(sysUser) > 0;
return StrUtil.isNotBlank(sysUserMapper.checkUsernameUnique(sysUser));
}
/**
@ -210,7 +212,7 @@ public class SysUserServiceImpl implements SysUserService {
* @return 结果
*/
private boolean checkPhoneNotUnique(SysUser sysUser) {
return sysUserMapper.checkPhoneUnique(sysUser) > 0;
return StrUtil.isNotBlank(sysUserMapper.checkPhoneUnique(sysUser));
}
/**
@ -220,7 +222,7 @@ public class SysUserServiceImpl implements SysUserService {
* @return 结果
*/
private boolean checkEmailNotUnique(SysUser sysUser) {
return sysUserMapper.checkEmailUnique(sysUser) > 0;
return StrUtil.isNotBlank(sysUserMapper.checkEmailUnique(sysUser));
}

4
qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysDeptMapper.xml
View File

@ -4,8 +4,8 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qiaoba.module.system.mapper.SysDeptMapper">
<select id="checkDeptNameUnique" resultType="int">
select count(1) from sys_dept
<select id="checkDeptNameUnique" resultType="string">
select dept_name from sys_dept
where dept_name = #{deptName} and parent_id = #{parentId}
<if test="deptId != null and deptId != ''">and dept_id != #{deptId}</if>
</select>

12
qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysUserMapper.xml
View File

@ -147,18 +147,18 @@
<select id="selectVoList" resultMap="SysUserVoResult">
<include refid="selectUserVo"/>
</select>
<select id="checkUsernameUnique" resultType="int">
select count(*) from sys_user where username = #{username}
<select id="checkUsernameUnique" resultType="string">
select username from sys_user where username = #{username}
<if test="userId != null and userId != ''">and user_id != #{userId}</if>
</select>
<select id="checkPhoneUnique" resultType="int">
select count(*) from sys_user where phone = #{phone}
<select id="checkPhoneUnique" resultType="string">
select phone from sys_user where phone = #{phone}
<if test="userId != null and userId != ''">and user_id != #{userId}</if>
</select>
<select id="checkEmailUnique" resultType="int">
select count(*) from sys_user where email = #{email}
<select id="checkEmailUnique" resultType="string">
select email from sys_user where email = #{email}
<if test="userId != null and userId != ''">and user_id != #{userId}</if>
</select>