From 264ae12101bff5dc71f864f72028bb1f1db17831 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 28 Apr 2020 14:32:39 +0800
Subject: [PATCH] update删除打印日志及控制走航车查询时间范围在一天内
---
src/main/java/com/moral/common/aop/ControllerAOP.java | 2 +-
src/main/java/com/moral/security/WebLogAspect.java | 10 ++++------
src/main/java/com/moral/controller/ScreenController.java | 10 +++++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/common/aop/ControllerAOP.java b/src/main/java/com/moral/common/aop/ControllerAOP.java
index 9e7c357..0c1c441 100644
--- a/src/main/java/com/moral/common/aop/ControllerAOP.java
+++ b/src/main/java/com/moral/common/aop/ControllerAOP.java
@@ -33,7 +33,7 @@
try {
result = pjp.proceed();
- log.info(pjp.getSignature() + "use time:" + (System.currentTimeMillis() - startTime));
+ // log.info(pjp.getSignature() + "use time:" + (System.currentTimeMillis() - startTime));
} catch (Throwable e) {
result = handlerException(pjp, e);
}
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 9403bfd..e9183f9 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1463,7 +1463,7 @@
@GetMapping("/carTrajectory")
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392082���", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac������������p5dnd7a0392081���", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "������������(���������2020-03-19-14)", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "������������(���������2020-03-19-17)", required = true, paramType = "query", dataType = "String")
})
@@ -1474,9 +1474,13 @@
String startHour = st.substring(st.lastIndexOf("-") + 1);
String startTime = startYearAndDay + " " + startHour + ":00:00";
String et = parameters.get("endTime").toString();
- String endYearAndDay = et.substring(0, et.lastIndexOf("-"));
String endHour = et.substring(et.lastIndexOf("-") + 1);
- String endTime = endYearAndDay + " " + endHour + ":00:00";
+ int endHourValue =Integer.valueOf(endHour);
+ int startHourValue =Integer.valueOf(startHour);
+ if(endHourValue<=startHourValue){
+ endHourValue=23;
+ }
+ String endTime = startYearAndDay + " " + endHourValue + ":00:00";
parameters.put("startTime", startTime);
parameters.put("endTime", endTime);
String mac = parameters.get("mac").toString();
diff --git a/src/main/java/com/moral/security/WebLogAspect.java b/src/main/java/com/moral/security/WebLogAspect.java
index af535d6..0763d13 100644
--- a/src/main/java/com/moral/security/WebLogAspect.java
+++ b/src/main/java/com/moral/security/WebLogAspect.java
@@ -1,7 +1,5 @@
package com.moral.security;
-import java.util.Arrays;
-
import javax.servlet.http.HttpServletRequest;
import org.aspectj.lang.JoinPoint;
@@ -34,26 +32,26 @@
HttpServletRequest request = attributes.getRequest();
// ���������������������
- LOG.info("������������ : " + request.getRequestURL().toString());
+ /*LOG.info("������������ : " + request.getRequestURL().toString());
LOG.info("HTTP METHOD : " + request.getMethod());
LOG.info("IP : " + request.getRemoteAddr());
LOG.info("CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "."
+ joinPoint.getSignature().getName());
- LOG.info("������ : " + Arrays.toString(joinPoint.getArgs()));
+ LOG.info("������ : " + Arrays.toString(joinPoint.getArgs()));*/
}
@AfterReturning(returning = "ret", pointcut = "logPointCut()")// returning���������doAfterReturning������������������
public void doAfterReturning(Object ret) throws Throwable {
// ������������������������������
- LOG.info("��������� : " + ret);
+ // LOG.info("��������� : " + ret);
}
@Around("logPointCut()")
public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
long startTime = System.currentTimeMillis();
Object ob = pjp.proceed();// ob ���������������������
- LOG.info("������ : " + (System.currentTimeMillis() - startTime));
+ // LOG.info("������ : " + (System.currentTimeMillis() - startTime));
return ob;
}
}
\ No newline at end of file
--
Gitblit v1.8.0