Browse Source

操作日志

master
刘力 3 years ago
parent
commit
76820515a1
  1. 9
      common/src/main/java/com/storeroom/utils/StringUtils.java
  2. 2
      logging/src/main/java/com/storeroom/annotation/Log.java
  3. 2
      logging/src/main/java/com/storeroom/aspect/LogAspect.java
  4. 6
      logging/src/main/java/com/storeroom/domain/Log.java
  5. 2
      logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java
  6. 5
      storeroom/pom.xml
  7. 2
      storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java

9
common/src/main/java/com/storeroom/utils/StringUtils.java

@ -178,6 +178,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils{
} }
} }
/**
* 获取端口号
* @param request
* @return
*/
public static String getPort(HttpServletRequest request) {
return request.getLocalPort() + "";
}
/** /**
* 根据ip获取详细地址 * 根据ip获取详细地址
*/ */

2
logging/src/main/java/com/storeroom/annotation/Log.java

@ -10,4 +10,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface Log { public @interface Log {
String value() default ""; String value() default "";
String apiAddress() default "";
} }

2
logging/src/main/java/com/storeroom/aspect/LogAspect.java

@ -53,6 +53,8 @@ public class LogAspect {
Log log = new Log("INFO", System.currentTimeMillis() - currentTime.get()); Log log = new Log("INFO", System.currentTimeMillis() - currentTime.get());
currentTime.remove(); currentTime.remove();
HttpServletRequest request = RequestHolder.getHttpServletRequest(); HttpServletRequest request = RequestHolder.getHttpServletRequest();
//获取端口号
log.setPort(StringUtils.getPort(request));
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log); logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), joinPoint, log);
return result; return result;
} }

6
logging/src/main/java/com/storeroom/domain/Log.java

@ -36,6 +36,12 @@ public class Log implements Serializable {
/** 日志类型 */ /** 日志类型 */
private String logType; private String logType;
/** 端口号 **/
private String port;
/**接口名称**/
private String ApiName;
/** 请求ip */ /** 请求ip */
private String requestIp; private String requestIp;

2
logging/src/main/java/com/storeroom/service/impl/LogServiceImpl.java

@ -71,7 +71,7 @@ public class LogServiceImpl implements LogService {
// 描述 // 描述
log.setDescription(aopLog.value()); log.setDescription(aopLog.value());
log.setApiName(aopLog.apiAddress());
log.setRequestIp(ip); log.setRequestIp(ip);
log.setAddress(StringUtils.getCityInfo(log.getRequestIp())); log.setAddress(StringUtils.getCityInfo(log.getRequestIp()));
log.setMethod(methodName); log.setMethod(methodName);

5
storeroom/pom.xml

@ -41,6 +41,11 @@
<version>5.8.3</version> <version>5.8.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.storeroom</groupId>
<artifactId>logging</artifactId>
<version>1.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java

@ -3,6 +3,7 @@ package com.storeroom.modules.storeroom3d.controller;
import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousGetMapping;
import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping;
import com.storeroom.annotation.Log;
import com.storeroom.exception.BaseException; import com.storeroom.exception.BaseException;
import com.storeroom.modules.storeroom3d.domain.GetCurAlarm; import com.storeroom.modules.storeroom3d.domain.GetCurAlarm;
import com.storeroom.modules.storeroom3d.service.AlarmInfoService; import com.storeroom.modules.storeroom3d.service.AlarmInfoService;
@ -37,6 +38,7 @@ public class AlarmInfoController {
@Log(value = "报警处理",apiAddress = "/api/alarm")
@AnonymousGetMapping("info") @AnonymousGetMapping("info")
public ApiResponse<Object> queryStoreroomId(@RequestParam String storeroomId) { public ApiResponse<Object> queryStoreroomId(@RequestParam String storeroomId) {
if (StringUtils.isEmpty(storeroomId)) { if (StringUtils.isEmpty(storeroomId)) {

Loading…
Cancel
Save