1、添加查询操作日志列表接口

src/main/java/com/cmeeting/controller/OperationLogController.java

+package com.cmeeting.controller;
+
+import com.cmeeting.pojo.OperationLog;
+import com.cmeeting.service.OperationLogService;
+import com.cmeeting.util.R;
+import com.cmeeting.util.page.PageUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@RequestMapping("/operLog")
+@RestController
+public class OperationLogController {
+
+    @Autowired
+    private OperationLogService operationLogService;
+
+    /**
+     * 获取操作日志列表
+     * @param searchValue     用户姓名/员工号
+     * @param createTimeStart 开始时间
+     * @param createTimeEnd   结束时间
+     * @return
+     */
+    @GetMapping("/list")
+    public R list(String searchValue, Date createTimeStart, Date createTimeEnd) {
+
+        PageUtil.startPage("create_time desc");
+
+        List<OperationLog> list = operationLogService.list(searchValue, createTimeStart, createTimeEnd);
+
+        return PageUtil.getDataTable(list);
+    }
+}

src/main/java/com/cmeeting/mapper/primary/OperationLogMapper.java

@@ -2,6 +2,11 @@ package com.cmeeting.mapper.primary;
 
 import com.cmeeting.pojo.OperationLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
 * @author Administrator
@@ -11,6 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 
+    /**
+     * 查询操作日志列表
+     * @param searchValue
+     * @param createTimeStart
+     * @param createTimeEnd
+     * @return
+     */
+    List<OperationLog> selectOperLogList(@Param("searchValue") String searchValue,
+                                         @Param("createTimeStart") Date createTimeStart,
+                                         @Param("createTimeEnd") Date createTimeEnd);
 }
 
 

src/main/java/com/cmeeting/pojo/OperationLog.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -47,5 +48,6 @@ public class OperationLog {
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyy-MM-dd HH:mm:ss")
     private Date createTime;
 }
\ No newline at end of file

src/main/java/com/cmeeting/service/OperationLogService.java

@@ -3,6 +3,9 @@ package com.cmeeting.service;
 import com.cmeeting.pojo.OperationLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【operation_log(操作日志)】的数据库操作Service
@@ -10,4 +13,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface OperationLogService extends IService<OperationLog> {
 
+    /**
+     * 获取操作日志列表
+     * @param searchValue     用户姓名/员工号
+     * @param createTimeStart 开始时间
+     * @param createTimeEnd   结束时间
+     * @return
+     */
+    List<OperationLog> list(String searchValue, Date createTimeStart, Date createTimeEnd);
 }

src/main/java/com/cmeeting/service/impl/OperationLogServiceImpl.java

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.pojo.OperationLog;
 import com.cmeeting.service.OperationLogService;
 import com.cmeeting.mapper.primary.OperationLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【operation_log(操作日志)】的数据库操作Service实现
@@ -15,6 +20,22 @@ import org.springframework.stereotype.Service;
 public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLog>
     implements OperationLogService{
 
+    @Autowired
+    private OperationLogMapper operationLogMapper;
+
+    /**
+     * 获取操作日志列表
+     *
+     * @param searchValue     用户姓名/员工号
+     * @param createTimeStart 开始时间
+     * @param createTimeEnd   结束时间
+     * @return
+     */
+    @Override
+    public List<OperationLog> list(String searchValue, Date createTimeStart, Date createTimeEnd) {
+
+        return operationLogMapper.selectOperLogList(searchValue, createTimeStart, createTimeEnd);
+    }
 }
 
 

src/main/resources/mapper/primary/OperationLogMapper.xml

@@ -16,4 +16,24 @@
     <sql id="Base_Column_List">
         id,user_name,user_id,location,operation,create_time
     </sql>
+
+    <!-- 查询操作日志列表 -->
+    <select id="selectOperLogList" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List" />
+        from
+            operation_log
+        <where>
+            <if test="searchValue != null and searchValue != ''">
+                and ( user_name like concat('%',#{searchValue},'%') or user_id like concat('%',#{searchValue},'%') )
+            </if>
+            <if test="createTimeStart != null">
+                and create_time &gt;= #{createTimeStart}
+            </if>
+            <if test="createTimeEnd != null">
+                and create_time &lt;= #{createTimeEnd}
+            </if>
+        </where>
+    </select>
+
 </mapper>