修改登录日志操作日志日期查询

base-system/src/main/java/com/ozs/system/mapper/SysLoginInfoMapper.java

@@ -3,6 +3,7 @@ package com.ozs.system.mapper;
 import java.util.List;
 
 import com.ozs.common.core.domain.entity.SysDictType;
+import com.ozs.common.core.domain.vo.SysLoginInfoVo;
 import com.ozs.system.domain.SysLoginInfo;
 import com.ozs.system.domain.SysLoginInfo;
 import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
@@ -26,10 +27,10 @@ public interface SysLoginInfoMapper extends JoinBaseMapper<SysLoginInfo> {
     /**
      * 查询系统登录日志集合
      *
-     * @param logininfor 访问日志对象
+     * @param sysLoginInfoVo 访问日志对象
      * @return 登录记录集合
      */
-    public List<SysLoginInfo> selectLogininforList(SysLoginInfo logininfor);
+    public List<SysLoginInfo> selectLogininforList(SysLoginInfoVo sysLoginInfoVo);
 
     /**
      * 批量删除系统登录日志

base-system/src/main/java/com/ozs/system/mapper/SysOperLogMapper.java

@@ -2,6 +2,7 @@ package com.ozs.system.mapper;
 
 import java.util.List;
 
+import com.ozs.common.core.domain.vo.SysOperlogVo;
 import com.ozs.system.domain.SysOperLog;
 import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,10 +24,10 @@ public interface SysOperLogMapper extends JoinBaseMapper<SysOperLog> {
     /**
      * 查询系统操作日志集合
      *
-     * @param operLog 操作日志对象
+     * @param sysOperlogVo 操作日志vo对象
      * @return 操作日志集合
      */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+    public List<SysOperLog> selectOperLogList(SysOperlogVo sysOperlogVo);
 
     /**
      * 批量删除系统操作日志

base-system/src/main/java/com/ozs/system/service/ISysLoginInfoService.java

@@ -2,7 +2,9 @@ package com.ozs.system.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.core.domain.entity.SysDictType;
+import com.ozs.common.core.domain.vo.SysLoginInfoVo;
 import com.ozs.system.domain.SysLoginInfo;
 import icu.mhb.mybatisplus.plugln.base.service.JoinIService;
 
@@ -18,14 +20,15 @@ public interface ISysLoginInfoService extends JoinIService<SysLoginInfo> {
      * @param logininfor 访问日志对象
      */
     public void insertLogininfor(SysLoginInfo logininfor);
+    IPage listToPage(List list, int pageNum, int pageSize);
 
     /**
      * 查询系统登录日志集合
      *
-     * @param logininfor 访问日志对象
+     * @param sysLoginInfoVo 访问日志对象
      * @return 登录记录集合
      */
-    public List<SysLoginInfo> selectLogininforList(SysLoginInfo logininfor);
+    public List<SysLoginInfo> selectLogininforList(SysLoginInfoVo sysLoginInfoVo);
 
     /**
      * 批量删除系统登录日志

base-system/src/main/java/com/ozs/system/service/ISysOperLogService.java

@@ -2,6 +2,8 @@ package com.ozs.system.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ozs.common.core.domain.vo.SysOperlogVo;
 import com.ozs.system.domain.SysNotice;
 import com.ozs.system.domain.SysOperLog;
 import icu.mhb.mybatisplus.plugln.base.service.JoinIService;
@@ -18,14 +20,15 @@ public interface ISysOperLogService extends JoinIService<SysOperLog> {
      * @param operLog 操作日志对象
      */
     public void insertOperlog(SysOperLog operLog);
+    IPage listToPage(List list, int pageNum, int pageSize);
 
     /**
      * 查询系统操作日志集合
      *
-     * @param operLog 操作日志对象
+     * @param sysOperlogVo 操作日志对象
      * @return 操作日志集合
      */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
+    public List<SysOperLog> selectOperLogList(SysOperlogVo sysOperlogVo);
 
     /**
      * 批量删除系统操作日志

base-system/src/main/java/com/ozs/system/service/impl/SysLoginInfoServiceImpl.java

@@ -1,8 +1,12 @@
 package com.ozs.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.entity.SysDictType;
+import com.ozs.common.core.domain.vo.SysLoginInfoVo;
 import com.ozs.system.mapper.SysDictTypeMapper;
 import icu.mhb.mybatisplus.plugln.base.service.impl.JoinServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,15 +36,26 @@ public class SysLoginInfoServiceImpl extends JoinServiceImpl<SysLoginInfoMapper,
         logininforMapper.insertLogininfor(logininfor);
     }
 
+    public IPage listToPage(List list, int pageNum, int pageSize) {
+        List pageList = new ArrayList<>();
+        int curIdx = pageNum > 1 ? (pageNum - 1) * pageSize : 0;
+        for (int i = 0; i < pageSize && curIdx + i < list.size(); i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+        IPage page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(list.size());
+        return page;
+    }
     /**
      * 查询系统登录日志集合
      *
-     * @param logininfor 访问日志对象
+     * @param sysLoginInfoVo 访问日志对象
      * @return 登录记录集合
      */
     @Override
-    public List<SysLoginInfo> selectLogininforList(SysLoginInfo logininfor) {
-        return logininforMapper.selectLogininforList(logininfor);
+    public List<SysLoginInfo> selectLogininforList(SysLoginInfoVo sysLoginInfoVo) {
+        return logininforMapper.selectLogininforList(sysLoginInfoVo);
     }
 
     /**

base-system/src/main/java/com/ozs/system/service/impl/SysOperLogServiceImpl.java

@@ -1,7 +1,11 @@
 package com.ozs.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.core.domain.vo.SysOperlogVo;
 import icu.mhb.mybatisplus.plugln.base.service.impl.JoinServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,15 +33,27 @@ public class SysOperLogServiceImpl extends JoinServiceImpl<SysOperLogMapper, Sys
         operLogMapper.insertOperlog(operLog);
     }
 
+    public IPage listToPage(List list, int pageNum, int pageSize) {
+        List pageList = new ArrayList<>();
+        int curIdx = pageNum > 1 ? (pageNum - 1) * pageSize : 0;
+        for (int i = 0; i < pageSize && curIdx + i < list.size(); i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+        IPage page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(list.size());
+        return page;
+    }
     /**
      * 查询系统操作日志集合
      *
-     * @param operLog 操作日志对象
+     * @param sysOperlogVo 操作日志对象
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
-        return operLogMapper.selectOperLogList(operLog);
+    public List<SysOperLog> selectOperLogList(SysOperlogVo sysOperlogVo) {
+        List<SysOperLog> list = operLogMapper.selectOperLogList(sysOperlogVo);
+        return list;
     }
 
     /**

base-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
 	</insert>
 
-	<select id="selectLogininforList" parameterType="SysLoginInfo" resultMap="SysLoginInfoesult">
+	<select id="selectLogininforList" parameterType="SysLoginInfoVo" resultMap="SysLoginInfoesult">
 		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_login_info
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
@@ -33,14 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="userName != null and userName != ''">
 				AND user_name like concat('%', #{userName}, '%')
 			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			<if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
+				and date_format(login_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
 			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+				and date_format(login_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 			</if>
 		</where>
-		order by info_id desc
+		order by login_time desc
 	</select>
 
 	<delete id="deleteLogininforByIds" parameterType="Long">

base-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{userId}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
 	</insert>
 
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
+	<select id="selectOperLogList" parameterType="SysOperlogVo" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="title != null and title != ''">
@@ -48,20 +48,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--		 			#{businessType}-->
 <!--		        </foreach>-->
 <!--			</if>-->
-			<if test="status != null">
-				AND status = #{status}
-			</if>
+<!--			<if test="status != null">-->
+<!--				AND status = #{status}-->
+<!--			</if>-->
 			<if test="userId != null and userId != ''">
 				AND user_id like concat('%', #{userId}, '%')
 			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+<!--			<if test="operatorType != null and operatorType != 0">-->
+<!--				AND operator_type like concat('%', #{operatorType}, '%')-->
+<!--			</if>-->
+			<if test="startTime != null and startTime != ''"><!-- 开始时间检索 -->
+				and date_format(oper_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
 			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			<if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+				and date_format(oper_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
 			</if>
 		</where>
-		order by oper_id desc
+		order by oper_time desc
 	</select>
 
 	<delete id="deleteOperLogByIds" parameterType="Long">