From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期一, 24 十月 2022 18:12:41 +0800 Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构 --- ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java index 0a7d69e..4f02c6b 100644 --- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java +++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java @@ -1,12 +1,17 @@ package com.ycl.controller.depart; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.annotation.LogSave; import com.ycl.api.BasePageDTO; import com.ycl.api.BasePageVO; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; +import com.ycl.entity.depart.DepartManager; import com.ycl.entity.depart.UmsDepart; +import com.ycl.entity.user.UmsDepartManage; import com.ycl.service.depart.UmsDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.utils.auth.UserAuthUtil; @@ -19,7 +24,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Arrays; import java.util.List; /** @@ -44,6 +48,7 @@ @ApiOperation("娣诲姞閮ㄩ棬") @PostMapping(value = "/create") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "娣诲姞閮ㄩ棬") public CommonResult<Void> create(@Validated @RequestBody DepartVO.AddDepartVO addDepartVO) { departService.create(addDepartVO); return CommonResult.success(null); @@ -51,6 +56,7 @@ @ApiOperation("缂栬緫閮ㄩ棬") @PostMapping(value = "/update") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "缂栬緫閮ㄩ棬") public CommonResult<Void> create(@Validated @RequestBody DepartVO.UpdateDepartVO params) { departService.update(params); return CommonResult.success(null); @@ -58,20 +64,22 @@ @ApiOperation("鍒犻櫎") @PostMapping(value = "/delete") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鍒犻櫎閮ㄩ棬") public CommonResult<Void> delete(@Validated @RequestBody DepartVO.IdDepartVO params) { departService.delete(params.getId()); return CommonResult.success(null); } /** - * @Description batch deletion departments - * @Param [ids] * @return com.ycl.api.CommonResult<java.lang.Void> + * @Description batch deletion departments + * @Param [ids] **/ @ApiOperation("鎵瑰鐞�-鍒犻櫎") @PostMapping(value = "/batch_deletion") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鎵归噺鍒犻櫎閮ㄩ棬") public CommonResult delete(@RequestParam List<Long> ids) { - if (ids.isEmpty()){ + if (ids.isEmpty()) { return CommonResult.failed("bad request parameter"); } return CommonResult.success(departService.removeBatchByIds(ids)); @@ -79,6 +87,7 @@ @ApiOperation("璇︽儏") @PostMapping(value = "/detail") + @LogSave(operationType = "閮ㄩ棬绠$悊", contain = "鏌ョ湅閮ㄩ棬") public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) { UmsDepart sccgDepart = departService.loadDepartById(params.getId()); return CommonResult.success(sccgDepart); @@ -100,16 +109,50 @@ @ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬") @GetMapping(value = "/page") - public CommonResult<IPage<UmsDepartVO>> page(DepartVO.PageDepartVO params) { - IPage<UmsDepartVO> page = departService.pageDepart(params); + public CommonResult<IPage<UmsDepartVO>> page(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "departName", required = false) String departName) { + IPage<UmsDepartVO> page = new Page<>(currentPage, pageSize); + departService.pageDepart(departName, page); return CommonResult.success(page); } @ApiOperation("鏌ヨ鎴戠殑閮ㄩ棬") @GetMapping(value = "/belongDepart") public CommonResult<BasePageDTO> belongDepart(BasePageVO params) { - BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize()); + BasePageDTO basePageDTO = umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize()); return CommonResult.success(basePageDTO); } -} + @ApiOperation("鐢ㄦ埛淇敼瑙掕壊") + @PutMapping(value = "/user_update_Role") + public CommonResult userUpdateRole(@RequestParam Long id, + @RequestParam List<Long> roles) { + umsAdminDepartService.userUpdateRoles(id, roles); + return CommonResult.success("update success"); + } + + @ApiOperation("鐢ㄦ埛淇敼閮ㄩ棬") + @PutMapping(value = "/user_update_depart") + public CommonResult userUpdateDepart(@RequestParam Long id, + @RequestParam List<UmsDepartManage> departmentIds) { + umsAdminDepartService.userUpdateDepart(id, departmentIds); + return CommonResult.success("update success"); + } + + @ApiOperation("鏌ヨ椤剁骇閮ㄩ棬") + @GetMapping(value = "/query_father") + public CommonResult search() { + Integer fatherId = 0; + return CommonResult.success(departService + .list(new LambdaQueryWrapper<UmsDepart>() + .eq(UmsDepart::getParentId, fatherId))); + } + + @ApiOperation("鏌ヨ閮ㄩ棬浜岀骇") + @GetMapping(value = "/query_father_children") + public CommonResult search(@RequestParam Integer fatherId) { + return CommonResult.success(departService + .list(new LambdaQueryWrapper<UmsDepart>() + .eq(UmsDepart::getParentId, fatherId))); + } +} \ No newline at end of file -- Gitblit v1.8.0