huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
樊宇 2021-11-04 08:56:13 +08:00
commit 08d72fe9ca
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dict/SysDictTypeController.java
View File

@ -60,7 +60,7 @@ public class SysDictTypeController {
@ApiOperation("/获得字典类型的分页列表") @ApiOperation("/获得字典类型的分页列表")
@GetMapping("/page") @GetMapping("/page")
@PreAuthorize("@ss.hasPermission('system:dict:quey')") @PreAuthorize("@ss.hasPermission('system:dict:query')")
public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Valid SysDictTypePageReqVO reqVO) { public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Valid SysDictTypePageReqVO reqVO) {
return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO))); return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO)));
} }
@ -68,7 +68,7 @@ public class SysDictTypeController {
@ApiOperation("/查询字典类型详细") @ApiOperation("/查询字典类型详细")
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@GetMapping(value = "/get") @GetMapping(value = "/get")
@PreAuthorize("@ss.hasPermission('system:dict:quey')") @PreAuthorize("@ss.hasPermission('system:dict:query')")
public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) { public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) {
return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id))); return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id)));
} }
@ -83,7 +83,7 @@ public class SysDictTypeController {
@ApiOperation("导出数据类型") @ApiOperation("导出数据类型")
@GetMapping("/export") @GetMapping("/export")
@PreAuthorize("@ss.hasPermission('system:dict:quey')") @PreAuthorize("@ss.hasPermission('system:dict:query')")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public void export(HttpServletResponse response, @Valid SysDictTypeExportReqVO reqVO) throws IOException { public void export(HttpServletResponse response, @Valid SysDictTypeExportReqVO reqVO) throws IOException {
List<SysDictTypeDO> list = dictTypeService.getDictTypeList(reqVO); List<SysDictTypeDO> list = dictTypeService.getDictTypeList(reqVO);

4
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/notice/SysNoticeController.java
View File

@ -56,7 +56,7 @@ public class SysNoticeController {
@GetMapping("/page") @GetMapping("/page")
@ApiOperation("获取通知公告列表") @ApiOperation("获取通知公告列表")
@PreAuthorize("@ss.hasPermission('system:notice:quey')") @PreAuthorize("@ss.hasPermission('system:notice:query')")
public CommonResult<PageResult<SysNoticeRespVO>> pageNotices(@Validated SysNoticePageReqVO reqVO) { public CommonResult<PageResult<SysNoticeRespVO>> pageNotices(@Validated SysNoticePageReqVO reqVO) {
return success(SysNoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO))); return success(SysNoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO)));
} }
@ -64,7 +64,7 @@ public class SysNoticeController {
@GetMapping("/get") @GetMapping("/get")
@ApiOperation("获得通知公告") @ApiOperation("获得通知公告")
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
@PreAuthorize("@ss.hasPermission('system:notice:quey')") @PreAuthorize("@ss.hasPermission('system:notice:query')")
public CommonResult<SysNoticeRespVO> getNotice(@RequestParam("id") Long id) { public CommonResult<SysNoticeRespVO> getNotice(@RequestParam("id") Long id) {
return success(SysNoticeConvert.INSTANCE.convert(noticeService.getNotice(id))); return success(SysNoticeConvert.INSTANCE.convert(noticeService.getNotice(id)));
} }

1
更新日志.md
View File

@ -21,6 +21,7 @@
## [v1.2.0] 进行中 ## [v1.2.0] 进行中
* 新增用户前台的昵称、头像的修改 * 新增用户前台的昵称、头像的修改
* 修复通知和字典查询权限 Bug
TODO TODO