日志分页，详情，字典

src/main/java/com/dragon/tj/portal/common/enums/log/ModuleEnum.java

@@ -1,7 +1,10 @@
 package com.dragon.tj.portal.common.enums.log;
 
+import com.google.common.collect.Maps;
 import lombok.Getter;
 
+import java.util.Map;
+
 /**
  * @author huey China.
  * @Description : 消息读状态
@@ -43,5 +46,13 @@ public enum ModuleEnum {
         this.desc = desc;
     }
 
+    public static Map<String, String> getMap() {
+        Map<String, String> map = Maps.newHashMap();
+        for (ModuleEnum module: values()) {
+            map.put(module.getCode(), module.getDesc());
+        }
+        return map;
+    }
+
 
 }

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

@@ -0,0 +1,46 @@
+package com.dragon.tj.portal.common.vo.log;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author huey China.
+ * @Description : 日志
+ * @Date Created in 2023/8/11 10:36
+ */
+@ToString
+@Getter
+@Setter
+public class LogPageParam extends Page {
+
+    /**
+     * 姓名,身份证好,操作类型,功能模块,操作时间
+     */
+    private String userName;
+    private String idCard;
+    /**
+     * 部门名称 模糊或code 下拉
+     */
+    private String orgCode;
+    private String orgName;
+    /**
+     * 功能模块
+     */
+    private String moduleType;
+    /**
+     * 操作类型
+     */
+    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;
+
+
+
+}

src/main/java/com/dragon/tj/portal/controller/SysLogController.java

@@ -1,9 +1,14 @@
 package com.dragon.tj.portal.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dragon.tj.portal.common.base.R;
+import com.dragon.tj.portal.common.enums.log.ModuleEnum;
+import com.dragon.tj.portal.common.vo.log.LogPageParam;
+import com.dragon.tj.portal.entity.SysLog;
+import com.dragon.tj.portal.service.SysLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -17,5 +22,38 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/sysLog")
 public class SysLogController {
 
+    @Autowired
+    private SysLogService sysLogService;
+
+    /**
+     * 分页查询
+     *
+     * @param
+     * @param req
+     * @return
+     */
+    @PostMapping("/page")
+    public R page(@RequestBody LogPageParam req) {
+        IPage iPage = sysLogService.queryPage(req, req);
+        return R.ok(iPage);
+    }
+
+    /**
+     * 详情
+     */
+    @GetMapping("detail")
+    public R detail(Long id) {
+        SysLog sysLog = sysLogService.getById(id);
+        return R.ok(sysLog);
+    }
+
+    /**
+     * 日志模块枚举返回
+     */
+    @GetMapping("moduleMap")
+    public R moduleMap() {
+        return R.ok(ModuleEnum.getMap());
+    }
+
 }
 

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

@@ -1,8 +1,12 @@
 package com.dragon.tj.portal.mapper;
 
-import com.dragon.tj.portal.entity.SysLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dragon.tj.portal.common.vo.log.LogPageParam;
+import com.dragon.tj.portal.entity.SysLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysLogMapper extends BaseMapper<SysLog> {
 
+    IPage queryPage(Page page, @Param("req") LogPageParam req);
 }

src/main/java/com/dragon/tj/portal/service/SysLogService.java

@@ -1,7 +1,10 @@
 package com.dragon.tj.portal.service;
 
-import com.dragon.tj.portal.entity.SysLog;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dragon.tj.portal.common.vo.log.LogPageParam;
+import com.dragon.tj.portal.entity.SysLog;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface SysLogService extends IService<SysLog> {
 
+    IPage queryPage(Page page, LogPageParam req);
+
 }

src/main/java/com/dragon/tj/portal/service/impl/SysLogServiceImpl.java

@@ -1,5 +1,9 @@
 package com.dragon.tj.portal.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dragon.tj.portal.common.enums.log.ModuleEnum;
+import com.dragon.tj.portal.common.vo.log.LogPageParam;
 import com.dragon.tj.portal.entity.SysLog;
 import com.dragon.tj.portal.mapper.SysLogMapper;
 import com.dragon.tj.portal.service.SysLogService;
@@ -17,4 +21,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
 
+    @Override
+    public IPage queryPage(Page page, LogPageParam req) {
+        return baseMapper.queryPage(page,req);
+    }
+
 }

src/main/resources/application-local.properties

@@ -1,7 +1,7 @@
-spring.datasource.url=jdbc:mysql:///portal?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://portal-tj.com:3306/portal?useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 #spring.datasource.url=jdbc:mysql://portal-tj.com:3306/portal?characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.username=portal
+spring.datasource.password=portal01!
 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 ###########kafka#############

src/main/resources/mapper/SysLogMapper.xml

@@ -2,4 +2,29 @@
 <!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 * from sys_log b
+        where del_flag = 0
+        <if test="req.userName != null  and req.userName != ''">
+            and b.create_user like concat('%',#{req.userName},'%')
+        </if>
+        <if test="req.idCard != null  and req.idCard != ''">
+            and b.create_by = #{req.idCard}
+        </if>
+        <if test="req.orgCode != null  and req.orgCode != ''">
+            and b.create_org_code = #{req.orgCode}
+        </if>
+        <if test="req.orgName != null  and req.orgName != ''">
+            and b.create_org_name like concat('%',#{req.orgName},'%')
+        </if>
+        <if test="req.moduleType != null and req.moduleType != ''">
+            and b.module_type = #{req.moduleType}
+        </if>
+        <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>
+    </select>
 </mapper>