Skip to content

G
guns-vip
Commit c3d287b8 by fengshuonan
Options

整理业务日志

parent 4df04de6
Showing with 42 additions and 17 deletions
src/main/java/cn/stylefeng/guns/core/common/constant/factory/PageFactory.java
...@@ -32,15 +32,28 @@ public class PageFactory<T> { ...@@ -32,15 +32,28 @@ public class PageFactory<T> {
public Page<T> defaultPage() { public Page<T> defaultPage() {
HttpServletRequest request = HttpContext.getRequest(); HttpServletRequest request = HttpContext.getRequest();
int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
int offset = Integer.valueOf(request.getParameter("offset")); //每页的偏移量(本页当前有多少条) //每页多少条数据
String sort = request.getParameter("sort"); //排序字段名称 int limit = Integer.valueOf(request.getParameter("limit"));
String order = request.getParameter("order"); //asc或desc(升序或降序)
//每页的偏移量(本页当前有多少条)
int offset = Integer.valueOf(request.getParameter("offset"));
//排序字段名称
String sort = request.getParameter("sort");
//asc或desc(升序或降序)
String order = request.getParameter("order");
//如果没有排序字段名称
if (ToolUtil.isEmpty(sort)) { if (ToolUtil.isEmpty(sort)) {
Page<T> page = new Page<>((offset / limit + 1), limit); Page<T> page = new Page<>((offset / limit + 1), limit);
page.setOpenSort(false); page.setOpenSort(false);
return page; return page;
} else { } else {
//如果有排序字段
Page<T> page = new Page<>((offset / limit + 1), limit, sort); Page<T> page = new Page<>((offset / limit + 1), limit, sort);
if (Order.ASC.getDes().equals(order)) { if (Order.ASC.getDes().equals(order)) {
page.setAsc(true); page.setAsc(true);
......
src/main/java/cn/stylefeng/guns/modular/system/controller/LogController.java
...@@ -55,6 +55,9 @@ public class LogController extends BaseController { ...@@ -55,6 +55,9 @@ public class LogController extends BaseController {
/** /**
* 跳转到日志管理的首页 * 跳转到日志管理的首页
*
* @author fengshuonan
* @Date 2018/12/23 5:34 PM
*/ */
@RequestMapping("") @RequestMapping("")
public String index() { public String index() {
...@@ -63,19 +66,35 @@ public class LogController extends BaseController { ...@@ -63,19 +66,35 @@ public class LogController extends BaseController {
/** /**
* 查询操作日志列表 * 查询操作日志列表
*
* @author fengshuonan
* @Date 2018/12/23 5:34 PM
*/ */
@RequestMapping("/list") @RequestMapping("/list")
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName, @RequestParam(required = false) Integer logType) { public Object list(@RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime,
@RequestParam(required = false) String logName,
@RequestParam(required = false) Integer logType) {
//获取分页参数
Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage(); Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage();
List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc());
//根据条件查询操作日志
List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName,
BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc());
page.setRecords(new LogWarpper(result).wrap()); page.setRecords(new LogWarpper(result).wrap());
return new PageInfoBT<>(page); return new PageInfoBT<>(page);
} }
/** /**
* 查询操作日志详情 * 查询操作日志详情
*
* @author fengshuonan
* @Date 2018/12/23 5:34 PM
*/ */
@RequestMapping("/detail/{id}") @RequestMapping("/detail/{id}")
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
...@@ -88,6 +107,9 @@ public class LogController extends BaseController { ...@@ -88,6 +107,9 @@ public class LogController extends BaseController {
/** /**
* 清空日志 * 清空日志
*
* @author fengshuonan
* @Date 2018/12/23 5:34 PM
*/ */
@BussinessLog(value = "清空业务日志") @BussinessLog(value = "清空业务日志")
@RequestMapping("/delLog") @RequestMapping("/delLog")
......
src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWarpper.java
...@@ -19,8 +19,6 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory; ...@@ -19,8 +19,6 @@ import cn.stylefeng.guns.core.common.constant.factory.ConstantFactory;
import cn.stylefeng.guns.core.util.Contrast; import cn.stylefeng.guns.core.util.Contrast;
import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper; import cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import cn.stylefeng.roses.kernel.model.page.PageResult;
import com.baomidou.mybatisplus.plugins.Page;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -41,14 +39,6 @@ public class LogWarpper extends BaseControllerWrapper { ...@@ -41,14 +39,6 @@ public class LogWarpper extends BaseControllerWrapper {
super(multi); super(multi);
} }
public LogWarpper(Page<Map<String, Object>> page) {
super(page);
}
public LogWarpper(PageResult<Map<String, Object>> pageResult) {
super(pageResult);
}
@Override @Override
protected void wrapTheMap(Map<String, Object> map) { protected void wrapTheMap(Map<String, Object> map) {
String message = (String) map.get("message"); String message = (String) map.get("message");
...@@ -63,7 +53,7 @@ public class LogWarpper extends BaseControllerWrapper { ...@@ -63,7 +53,7 @@ public class LogWarpper extends BaseControllerWrapper {
} }
//如果信息中包含分割符号;;; 则分割字符串返给前台 //如果信息中包含分割符号;;; 则分割字符串返给前台
if (ToolUtil.isNotEmpty(message) && message.indexOf(Contrast.separator) != -1) { if (ToolUtil.isNotEmpty(message) && message.contains(Contrast.separator)) {
String[] msgs = message.split(Contrast.separator); String[] msgs = message.split(Contrast.separator);
map.put("regularMessage", msgs); map.put("regularMessage", msgs);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment