From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作

---
 src/main/java/com/whyc/service/DocLogService.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index c0fa527..a8d9a94 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -67,45 +67,66 @@
         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);
         mapper.insert(docLog);
     }
     //鏃ュ織鏌ヨ
-    public Response searchLog(int pageCurr, int pageSize) {
+    public Response searchLog(DocLog docLog,int pageCurr, int pageSize) {
         PageHelper.startPage(pageCurr,pageSize);
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.notIn("oprate_type", UserOperation.TYPE_EXCEPTION.getType());
+        if(docLog!=null){
+            if(docLog.getName()!=null&&docLog.getName()!=""){
+                wrapper.like("name",docLog.getName());
+            }
+            if(docLog.getOprateType()!=null){
+                wrapper.eq("oprate_type",docLog.getOprateType());
+            }
+            if(docLog.getOprateDay()!=null){
+                wrapper.ge("oprate_day",docLog.getOprateDay());
+            }
+            if(docLog.getOprateDay2()!=null){
+                wrapper.le("oprate_day",docLog.getOprateDay2());
+            }
+        }
+        wrapper.ne("id", 0);
+        wrapper.ne("oprate_type",UserOperation.TYPE_EXCEPTION.getType());
         wrapper.orderByDesc("oprate_day");
-        List list=mapper.selectList(wrapper);
+        List<DocLog> list=mapper.selectList(wrapper);
+        list.stream().forEach(dlog->{
+            dlog.setOperationTypeStr(UserOperation.getNameByType(dlog.getOprateType()));
+        });
         PageInfo pageInfo=new PageInfo(list);
         return new Response().setII(1,list.size()>0?true:false,pageInfo,"鏁版嵁杩斿洖");
     }

--
Gitblit v1.9.1