微调

pom.xml

@@ -31,16 +31,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/shr/controller/LogController.java

+package com.shr.controller;
+
+import com.shr.common.response.RestResponse;
+import com.shr.serivce.ILogService;
+import com.shr.transfer.log.LogListInVo;
+import com.shr.transfer.log.LogListOutVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Inori
+ */
+@RestController
+@RequestMapping("/api")
+public class LogController {
+
+    @Autowired
+    private ILogService logService;
+
+
+    @PostMapping("/log/list")
+    public RestResponse logList(@RequestBody(required = true) @Validated LogListInVo inVo) {
+        LogListOutVo outVo = logService.logList(inVo);
+        return RestResponse.success(outVo);
+    }
+
+
+}

src/main/java/com/shr/dao/LogMapper.java

 package com.shr.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.shr.model.Log;
+import com.shr.transfer.log.LogListInVo;
+import com.shr.transfer.log.LogListOutVoRecords;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author Inori
  */
 public interface LogMapper extends BaseMapper<Log> {
+
+    /**
+     * 日志列表
+     *
+     * @param page 分页
+     * @param inVo 条件
+     * @return 列表
+     */
+    List<LogListOutVoRecords> logList(@Param("page") Page<LogListOutVoRecords> page, @Param("inVo") LogListInVo inVo);
+
+
 }

src/main/java/com/shr/dao/mapper/LogMapper.xml

@@ -4,4 +4,28 @@
 
 
 
+    <select id="logList" parameterType="com.shr.transfer.log.LogListInVo" resultType="com.shr.transfer.log.LogListOutVoRecords">
+
+        SELECT
+            l.content, l.system_type, l.result, l.create_time
+        FROM tb_log AS l
+        <where>
+            <if test="inVo.dateFrom != null and inVo.dateFrom != '' ">
+                and l.create_time &gt;= #{inVo.dateFrom}
+            </if>
+            <if test="inVo.dateTo != null and inVo.dateTo != ''">
+                and l.create_time &lt;= #{inVo.dateTo}
+            </if>
+            <if test="inVo.content != null and inVo.content != ''">
+                and l.content like CONCAT("%", #{inVo.content}, "%")
+            </if>
+            <if test="inVo.systemType != null and inVo.systemType != ''">
+                and l.system_type = #{inVo.systemType}
+            </if>
+        </where>
+
+    </select>
+
+
+
 </mapper>

src/main/java/com/shr/serivce/ILogService.java

+package com.shr.serivce;
+
+import com.shr.transfer.log.LogListInVo;
+import com.shr.transfer.log.LogListOutVo;
+
+/**
+ * @author Inori
+ */
+public interface ILogService {
+
+    /**
+     * 日志列表
+     *
+     * @param inVo 条件
+     * @return 列表
+     */
+    LogListOutVo logList(LogListInVo inVo);
+
+
+}

src/main/java/com/shr/serivce/impl/LogServiceImpl.java

+package com.shr.serivce.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.shr.dao.LogMapper;
+import com.shr.serivce.ILogService;
+import com.shr.transfer.log.LogListInVo;
+import com.shr.transfer.log.LogListOutVo;
+import com.shr.transfer.log.LogListOutVoRecords;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Inori
+ */
+@Service
+public class LogServiceImpl implements ILogService {
+
+    @Autowired
+    private LogMapper logMapper;
+
+
+    @Override
+    public LogListOutVo logList(LogListInVo inVo) {
+        Page<LogListOutVoRecords> page = new Page<>(inVo.getPageNo(), inVo.getPageSize());
+        List<LogListOutVoRecords> recordsList = logMapper.logList(page, inVo);
+
+        LogListOutVo outVo = new LogListOutVo();
+        outVo.setTotal((int) page.getTotal());
+        outVo.setRecords(recordsList);
+        return outVo;
+    }
+
+
+}

src/main/java/com/shr/transfer/log/LogListInVo.java

+package com.shr.transfer.log;
+
+import com.shr.utils.StringUtil;
+
+/**
+ * @author Inori
+ */
+public class LogListInVo {
+
+    /**
+     * 访问内容
+     */
+    private String content;
+
+
+    /**
+     * 系统类型
+     */
+    private String systemType;
+
+
+    /**
+     * 开始时间
+     */
+    private String dateFrom;
+
+
+    /**
+     * 结束时间
+     */
+    private String dateTo;
+
+
+    /**
+     * 页码
+     */
+    private Integer pageNo;
+
+
+    /**
+     * 每页数量
+     */
+    private Integer pageSize;
+
+
+    private static final Integer DEFAULT_PAGE_NO = 1;
+    private static final Integer DEFAULT_PAGE_SIZE = 20;
+
+
+    public LogListInVo() {
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getSystemType() {
+        return systemType;
+    }
+
+    public void setSystemType(String systemType) {
+        this.systemType = systemType;
+    }
+
+    public String getDateFrom() {
+        return dateFrom;
+    }
+
+    public void setDateFrom(String dateFrom) {
+        this.dateFrom = dateFrom;
+    }
+
+    public String getDateTo() {
+        return dateTo;
+    }
+
+    public void setDateTo(String dateTo) {
+        this.dateTo = dateTo;
+    }
+
+
+    public Integer getPageNo() {
+        if (StringUtil.isNull(pageNo) || pageNo == -1) {
+            return DEFAULT_PAGE_NO;
+        }
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        if (StringUtil.isNull(pageSize) || pageSize == -1) {
+            return DEFAULT_PAGE_SIZE;
+        }
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+
+}

src/main/java/com/shr/transfer/log/LogListOutVo.java

+package com.shr.transfer.log;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author Inori
+ */
+@Data
+public class LogListOutVo {
+
+    /**
+     * 总数
+     */
+    @NotNull(message = "参数total缺失")
+    private Integer total;
+
+
+    /**
+     * 记录
+     */
+    @NotNull(message = "参数records缺失")
+    private List<LogListOutVoRecords> records;
+
+
+}

src/main/java/com/shr/transfer/log/LogListOutVoRecords.java

+package com.shr.transfer.log;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author Inori
+ */
+@Data
+public class LogListOutVoRecords {
+
+    /**
+     * 访问内容
+     */
+    @NotBlank(message = "参数content缺失")
+    private String content;
+
+
+    /**
+     * 系统类型
+     */
+    @NotBlank(message = "参数systemType缺失")
+    private String systemType;
+
+
+    /**
+     * 返回结果
+     */
+    @NotBlank(message = "参数result缺失")
+    private String result;
+
+
+    /**
+     * 创建时间
+     */
+    @NotBlank(message = "参数createTime缺失")
+    private String createTime;
+
+
+}