wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-31 14:57:36 +08:00
parent b7d81a8558 ddd1c3196a
commit 3ddd730000
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/modules/log/service/impl/SysLogOperationServiceImpl.java
View File

@ -56,14 +56,14 @@ public class SysLogOperationServiceImpl extends BaseServiceImpl<SysLogOperationD
.like(StringUtils.isNotBlank(operation), "operation", operation)
.between(StringUtils.isNotBlank(startDate), "create_date", startDate, endDate);
if (params.containsKey("operationType")) {
queryWrapper.ne("request_uri", "/renren-admin/resource/updateVisits");
queryWrapper.ne("request_uri", "/ucs-admin/resource/updateVisits");
if ("all".equals(operationType)) {
queryWrapper.and(wrapper ->
wrapper.like("request_uri", "/renren-admin/resource%/insert")
wrapper.like("request_uri", "/ucs-admin/resource%/insert")
.or()
.like("request_uri", "/renren-admin/resource%/update")
.like("request_uri", "/ucs-admin/resource%/update")
.or()
.like("request_uri", "/renren-admin/resource%/delete"));
.like("request_uri", "/ucs-admin/resource%/delete"));
} else {
queryWrapper.like(StringUtils.isNotBlank(operationType), "request_uri", operationType);
}

26
renren-admin/src/main/java/io/renren/modules/sys/controller/SysDeptController.java
View File

@ -1,6 +1,8 @@
package io.renren.modules.sys.controller;
import io.renren.common.annotation.LogOperation;
import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.common.utils.Result;
import io.renren.common.validator.AssertUtils;
import io.renren.common.validator.ValidatorUtils;
@ -15,14 +17,18 @@ import io.renren.modules.sys.enums.SuperAdminEnum;
import io.renren.modules.sys.service.SysDeptService;
import io.renren.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.*;
import java.util.stream.Collectors;
/**
* 部门管理
@ -48,6 +54,26 @@ public class SysDeptController {
return new Result<List<SysDeptDTO>>().ok(list);
}
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int")
})
public Result<PageData<SysDeptDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
long curPage = 1;
long limit = 10;
if (params.get(Constant.PAGE) != null) {
curPage = Long.parseLong((String) params.get(Constant.PAGE));
}
if (params.get(Constant.LIMIT) != null) {
limit = Long.parseLong((String) params.get(Constant.LIMIT));
}
List<SysDeptDTO> dtoList = sysDeptService.list(new HashMap<>(1));
List<SysDeptDTO> result = dtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList());
return new Result<PageData<SysDeptDTO>>().ok(new PageData(result, dtoList.size()));
}
@GetMapping("listForRegion")
@ApiOperation("查询区域管理员管理的部门")
@LogOperation("查询区域管理员管理的部门")

2
renren-admin/src/main/resources/application.yml
View File

@ -36,7 +36,7 @@ server:
min-spare: 30
port: 9090
servlet:
context-path: /renren-admin
context-path: /ucs-admin
session:
cookie:
http-only: true