提交 6ae6e8b6 authored 作者: inroi's avatar inroi

微调

上级 69fb415b
package com.shr.controller; package com.shr.controller;
import com.shr.annotion.AccessLog;
import com.shr.common.response.RestResponse; import com.shr.common.response.RestResponse;
import com.shr.serivce.ILogService; import com.shr.serivce.ILogService;
import com.shr.transfer.log.LogListInVo; import com.shr.transfer.log.LogListInVo;
...@@ -22,6 +23,7 @@ public class LogController { ...@@ -22,6 +23,7 @@ public class LogController {
private ILogService logService; private ILogService logService;
@AccessLog("日志列表")
@PostMapping("/log/list") @PostMapping("/log/list")
public RestResponse logList(@RequestBody(required = true) @Validated LogListInVo inVo) { public RestResponse logList(@RequestBody(required = true) @Validated LogListInVo inVo) {
LogListOutVo outVo = logService.logList(inVo); LogListOutVo outVo = logService.logList(inVo);
......
package com.shr.dao; package com.shr.dao;
import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.shr.model.Log; import com.shr.model.Log;
import com.shr.transfer.log.LogListInVo; import com.shr.transfer.log.LogListInVo;
import com.shr.transfer.log.LogListOutVoRecords; import com.shr.transfer.log.LogListOutVoRecords;
...@@ -17,11 +16,17 @@ public interface LogMapper extends BaseMapper<Log> { ...@@ -17,11 +16,17 @@ public interface LogMapper extends BaseMapper<Log> {
/** /**
* 日志列表 * 日志列表
* *
* @param page 分页
* @param inVo 条件 * @param inVo 条件
* @return 列表 * @return 列表
*/ */
List<LogListOutVoRecords> logList(@Param("page") Page<LogListOutVoRecords> page, @Param("inVo") LogListInVo inVo); List<LogListOutVoRecords> logList(@Param("inVo") LogListInVo inVo);
/**
* 创建日志
*
* @param log 日志
*/
void createLog(Log log);
/** /**
* 是否存在表 * 是否存在表
......
...@@ -7,20 +7,20 @@ ...@@ -7,20 +7,20 @@
<select id="logList" parameterType="com.shr.transfer.log.LogListInVo" resultType="com.shr.transfer.log.LogListOutVoRecords"> <select id="logList" parameterType="com.shr.transfer.log.LogListInVo" resultType="com.shr.transfer.log.LogListOutVoRecords">
SELECT SELECT
l.content, l.system_type, l.result, l.create_time content, system_type, result, create_time
FROM tb_log AS l FROM tb_log
<where> <where>
<if test="inVo.dateFrom != null and inVo.dateFrom != '' "> <if test="inVo.dateFrom != null and inVo.dateFrom != '' ">
and l.create_time &gt;= #{inVo.dateFrom} and create_time &gt;= #{inVo.dateFrom}
</if> </if>
<if test="inVo.dateTo != null and inVo.dateTo != ''"> <if test="inVo.dateTo != null and inVo.dateTo != ''">
and l.create_time &lt;= #{inVo.dateTo} and create_time &lt;= #{inVo.dateTo}
</if> </if>
<if test="inVo.content != null and inVo.content != ''"> <if test="inVo.content != null and inVo.content != ''">
and l.content like CONCAT("%", #{inVo.content}, "%") and content like CONCAT("%", #{inVo.content}, "%")
</if> </if>
<if test="inVo.systemType != null and inVo.systemType != ''"> <if test="inVo.systemType != null and inVo.systemType != ''">
and l.system_type = #{inVo.systemType} and system_type = #{inVo.systemType}
</if> </if>
</where> </where>
...@@ -28,6 +28,14 @@ ...@@ -28,6 +28,14 @@
<insert id="createLog" parameterType="com.shr.model.Log">
INSERT INTO tb_log (content, system_type, result) VALUES (#{content}, #{systemType}, #{result})
</insert>
<select id="isTable" resultType="java.lang.Integer"> <select id="isTable" resultType="java.lang.Integer">
select count(*) from user_tables where table_name =upper('tb_log') select count(*) from user_tables where table_name =upper('tb_log')
...@@ -39,10 +47,12 @@ ...@@ -39,10 +47,12 @@
<insert id="createTable"> <insert id="createTable">
create table tb_log ( create table tb_log (
`id` VARCHAR2(32) DEFAULT SYS_GUID() PRIMARY KEY, id VARCHAR2(32) DEFAULT SYS_GUID() PRIMARY KEY,
`content` VARCHAR2(500) default null, content VARCHAR2(500) DEFAULT NULL,
`system_type` VARCHAR2(50) default null, system_type VARCHAR2(50) DEFAULT NULL,
`result` BLOB default null result CLOB DEFAULT NULL,
create_time TIMESTAMP DEFAULT SYSDATE,
update_time TIMESTAMP DEFAULT SYSDATE
) )
</insert> </insert>
......
...@@ -2,9 +2,6 @@ package com.shr.log.factory; ...@@ -2,9 +2,6 @@ package com.shr.log.factory;
import com.shr.model.Log; import com.shr.model.Log;
import org.apache.commons.lang.time.DateFormatUtils;
import java.util.Date;
/** /**
* 日志对象创建工厂 * 日志对象创建工厂
...@@ -21,7 +18,6 @@ public class LogFactory { ...@@ -21,7 +18,6 @@ public class LogFactory {
log.setContent(content); log.setContent(content);
log.setSystemType(systemType); log.setSystemType(systemType);
log.setResult(result); log.setResult(result);
log.setCreateTime(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
return log; return log;
} }
......
...@@ -27,7 +27,7 @@ public class LogTaskFactory { ...@@ -27,7 +27,7 @@ public class LogTaskFactory {
public void run() { public void run() {
Log sysLog = LogFactory.createOperationLog(content, systemType, result); Log sysLog = LogFactory.createOperationLog(content, systemType, result);
try { try {
logMapper.insert(sysLog); logMapper.createLog(sysLog);
} catch (Exception e) { } catch (Exception e) {
logger.error("日志创建失败!", e); logger.error("日志创建失败!", e);
} }
......
...@@ -11,7 +11,7 @@ public class Log { ...@@ -11,7 +11,7 @@ public class Log {
/** /**
* 用户ID * 用户ID
*/ */
private String id; private Long id;
/** /**
...@@ -41,11 +41,11 @@ public class Log { ...@@ -41,11 +41,11 @@ public class Log {
public Log() { public Log() {
} }
public String getId() { public Long getId() {
return id; return id;
} }
public void setId(String id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
package com.shr.serivce.impl; package com.shr.serivce.impl;
import com.baomidou.mybatisplus.plugins.Page;
import com.shr.dao.LogMapper; import com.shr.dao.LogMapper;
import com.shr.serivce.ILogService; import com.shr.serivce.ILogService;
import com.shr.transfer.log.LogListInVo; import com.shr.transfer.log.LogListInVo;
...@@ -25,7 +24,7 @@ public class LogServiceImpl implements ILogService { ...@@ -25,7 +24,7 @@ public class LogServiceImpl implements ILogService {
@PostConstruct @PostConstruct
public void init() { public void init() {
Integer isTable = logMapper.isTable(); Integer isTable = logMapper.isTable();
System.out.println(isTable); System.out.println("+++++++++++>" + isTable);
if (isTable == 0) { if (isTable == 0) {
logMapper.createTable(); logMapper.createTable();
} }
...@@ -33,11 +32,9 @@ public class LogServiceImpl implements ILogService { ...@@ -33,11 +32,9 @@ public class LogServiceImpl implements ILogService {
@Override @Override
public LogListOutVo logList(LogListInVo inVo) { public LogListOutVo logList(LogListInVo inVo) {
Page<LogListOutVoRecords> page = new Page<>(inVo.getPageNo(), inVo.getPageSize()); List<LogListOutVoRecords> recordsList = logMapper.logList(inVo);
List<LogListOutVoRecords> recordsList = logMapper.logList(page, inVo);
LogListOutVo outVo = new LogListOutVo(); LogListOutVo outVo = new LogListOutVo();
outVo.setTotal((int) page.getTotal());
outVo.setRecords(recordsList); outVo.setRecords(recordsList);
return outVo; return outVo;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论