From d90f0e1d65c60d5d8f382595cc2b51e36ba26546 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期三, 27 七月 2022 11:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/DocLogService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index fe06c07..a8d9a94 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -67,33 +67,36 @@
ExcelUtil.exportExcel("UserLog-"+now,"娴嬭瘯sheet1",columnTitleArr,value,new HSSFWorkbook(),response);
}
- public void record(long uId, int operationType, String msg) {
+ public void record(long uId,String name, int operationType, String msg) {
DocLog docLog = new DocLog();
docLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
docLog.setOprateDay(new Date());
docLog.setId((int)(uId));
+ docLog.setName(name);
docLog.setOprateType(operationType);
docLog.setOprateMsg(msg);
mapper.insert(docLog);
}
- public void record(long uId, int operationType, String msg,String msgDetail) {
+ public void record(long uId,String name, int operationType, String msg,String msgDetail) {
DocLog docLog = new DocLog();
docLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
docLog.setOprateDay(new Date());
docLog.setId((int)(uId));
+ docLog.setName(name);
docLog.setOprateType(operationType);
docLog.setOprateMsg(msg);
docLog.setOperationDetail(msgDetail);
mapper.insert(docLog);
}
- public void record2(HttpServletRequest request, long uId, int operationType, String msg, String msgDetail) {
+ public void record2(HttpServletRequest request,long uId, String name, int operationType, String msg, String msgDetail) {
DocLog docLog = new DocLog();
docLog.setTerminalIp(request.getRemoteAddr());
//userLog.setTerminalIp(request.getRemoteAddr());
docLog.setOprateDay(new Date());
docLog.setId((int)(uId));
+ docLog.setName(name);
docLog.setOprateType(operationType);
docLog.setOprateMsg(msg);
docLog.setOperationDetail(msgDetail);
@@ -118,6 +121,7 @@
}
}
wrapper.ne("id", 0);
+ wrapper.ne("oprate_type",UserOperation.TYPE_EXCEPTION.getType());
wrapper.orderByDesc("oprate_day");
List<DocLog> list=mapper.selectList(wrapper);
list.stream().forEach(dlog->{
--
Gitblit v1.9.1