diff --git a/src/main/java/com/nis/domain/SwaggerLog.java b/src/main/java/com/nis/domain/SwaggerLog.java index df633d7..a2634b3 100644 --- a/src/main/java/com/nis/domain/SwaggerLog.java +++ b/src/main/java/com/nis/domain/SwaggerLog.java @@ -17,7 +17,7 @@ public class SwaggerLog extends BaseEntity { private String serverIp; private String traceCode; private String requestUri; - + private String tableName; private String exception;// 界面的异常信息框 private Date beginDate; // 开始日期 @@ -151,4 +151,12 @@ public class SwaggerLog extends BaseEntity { this.requestUri = requestUri; } + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + } diff --git a/src/main/java/com/nis/web/controller/sys/SysLogController.java b/src/main/java/com/nis/web/controller/sys/SysLogController.java index 14c0607..190cc6a 100644 --- a/src/main/java/com/nis/web/controller/sys/SysLogController.java +++ b/src/main/java/com/nis/web/controller/sys/SysLogController.java @@ -3,6 +3,7 @@ package com.nis.web.controller.sys; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -27,8 +28,16 @@ public class SysLogController extends BaseController { @RequiresPermissions("sys:swaggerLogList:view") @RequestMapping(value = "swaggerLogList") - public String swaggerLogList(SwaggerLog swaggerLog, HttpServletRequest request, HttpServletResponse response, Model model) { - Page page = swaggerLogService.findSwaggerLogPage(new Page(request, response), swaggerLog); + public String swaggerLogList(SwaggerLog swaggerLog, HttpServletRequest request, HttpServletResponse response, + Model model) { + if (swaggerLog.getOpAction() != null && swaggerLog.getOpAction() == 4) { + swaggerLog.setTableName("services_log_request_log"); + } else { + swaggerLog.setTableName("services_config_request_log"); + } + swaggerLog.setRequestContent(StringEscapeUtils.unescapeHtml4(swaggerLog.getRequestContent())); + Page page = swaggerLogService.findSwaggerLogPage(new Page(request, response), + swaggerLog); model.addAttribute("page", page); return "/sys/swaggerLogList"; } diff --git a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.java b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.java index 853a84b..0b24282 100644 --- a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.java +++ b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.java @@ -16,6 +16,8 @@ import com.nis.domain.restful.ServicesRequestLogBean; public interface ServicesRequestLogDao { int insert(ServicesRequestLog record); + int insertConfigLog(ServicesRequestLog record); + int insertLogLog(ServicesRequestLog record); public void deleteById(Long id); diff --git a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml index b2afdd9..b533ea0 100644 --- a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml +++ b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml @@ -176,4 +176,185 @@ + + + insert into SERVICES_CONFIG_REQUEST_LOG + + + + OPERATOR, + + + VERSION, + + + OPACTION, + + + OPTIME, + + + REQUEST_CONTENT, + + + REQUEST_TIME, + + + CONSUMER_TIME, + + + REQUEST_IP, + + + BUSINESS_CODE, + + + EXCEPTION_INFO, + + + SERVER_IP, + + + TRACE_CODE, + + + REQUEST_URI, + + + + + + + #{operator,jdbcType=VARCHAR}, + + + #{version,jdbcType=VARCHAR}, + + + #{opAction,jdbcType=INTEGER}, + + + #{opTime,jdbcType=TIMESTAMP}, + + + #{requestContent,jdbcType=CLOB}, + + + #{requestTime,jdbcType=TIMESTAMP}, + + + #{consumerTime,jdbcType=BIGINT}, + + + #{requestIp,jdbcType=VARCHAR}, + + + #{businessCode,jdbcType=INTEGER}, + + + #{exceptionInfo,jdbcType=VARCHAR}, + + + #{serverIp,jdbcType=VARCHAR}, + + + #{traceCode,jdbcType=VARCHAR}, + + + #{requestURI,jdbcType=VARCHAR}, + + + + + + + + + insert into SERVICES_LOG_REQUEST_LOG + + + + OPERATOR, + + + VERSION, + + + OPACTION, + + + OPTIME, + + + REQUEST_CONTENT, + + + REQUEST_TIME, + + + CONSUMER_TIME, + + + REQUEST_IP, + + + BUSINESS_CODE, + + + EXCEPTION_INFO, + + + SERVER_IP, + + + TRACE_CODE, + + + REQUEST_URI, + + + + + + + #{operator,jdbcType=VARCHAR}, + + + #{version,jdbcType=VARCHAR}, + + + #{opAction,jdbcType=INTEGER}, + + + #{opTime,jdbcType=TIMESTAMP}, + + + #{requestContent,jdbcType=CLOB}, + + + #{requestTime,jdbcType=TIMESTAMP}, + + + #{consumerTime,jdbcType=BIGINT}, + + + #{requestIp,jdbcType=VARCHAR}, + + + #{businessCode,jdbcType=INTEGER}, + + + #{exceptionInfo,jdbcType=VARCHAR}, + + + #{serverIp,jdbcType=VARCHAR}, + + + #{traceCode,jdbcType=VARCHAR}, + + + #{requestURI,jdbcType=VARCHAR}, + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SwaggerLogDao.xml b/src/main/java/com/nis/web/dao/SwaggerLogDao.xml index f15ce0b..9f534f1 100644 --- a/src/main/java/com/nis/web/dao/SwaggerLogDao.xml +++ b/src/main/java/com/nis/web/dao/SwaggerLogDao.xml @@ -5,7 +5,7 @@ "/>
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> - " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>   + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/> + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>     + 只查询异常信息