[Feature] Log

src/main/java/com/dragon/tj/portal/common/vo/log/LogPageParam.java

@@ -1,6 +1,7 @@
 package com.dragon.tj.portal.common.vo.log;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dragon.tj.portal.common.constants.DateTimeFormatterConstant;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
@@ -36,10 +37,11 @@ public class LogPageParam extends Page {
      * 操作类型
      */
     private String title;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime creatTimeStart;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime creatTimeEnd;
+
+    @JsonFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
+    private LocalDateTime createTimeStart;
+    @JsonFormat(pattern = DateTimeFormatterConstant.OF_PATTERN_1)
+    private LocalDateTime createTimeEnd;
 
 
 

src/main/java/com/dragon/tj/portal/mapper/SysLogMapper.java

@@ -19,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface SysLogMapper extends BaseMapper<SysLog> {
 
-    IPage queryPage(Page page, @Param("req") LogPageParam req);
+    IPage<SysLog> queryPage(Page page, @Param("req") LogPageParam req);
 }

src/main/resources/mapper/SysLogMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dragon.tj.portal.mapper.SysLogMapper">
 
-    <select id="queryPage" resultType="com.baomidou.mybatisplus.core.metadata.IPage">
+    <select id="queryPage" resultType="com.dragon.tj.portal.entity.SysLog">
         SELECT * from sys_log b
         where del_flag = 0
         <if test="req.userName != null  and req.userName != ''">
@@ -23,8 +23,8 @@
         <if test="req.title != null and req.title != ''">
             and b.title like concat('%',#{req.title},'%')
         </if>
-        <if test="req.creatTimeStart != null and req.creatTimeEnd != null ">
-            and b.create_time >= #{req.creatTimeStart} and b.create_time &lt;= #{req.creatTimeEnd}
+        <if test="req.createTimeStart != null and req.createTimeEnd != null ">
+            and b.create_time >= #{req.createTimeStart} and b.create_time &lt;= #{req.createTimeEnd}
         </if>
     </select>
 </mapper>