feat:新增切面日志功能

pom.xml

@@ -42,6 +42,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>

src/main/java/com/jwkj/qsydw/annotation/Loggable.java

@@ -0,0 +1,17 @@
+package com.jwkj.qsydw.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 日志收集
+ * @author Xu·LinPeng
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Loggable {
+    String value() ;
+
+}

src/main/java/com/jwkj/qsydw/annotation/TestDate.java

@@ -0,0 +1,8 @@
+package com.jwkj.qsydw.annotation;
+
+/**
+ * @author Xu·LinPeng
+ */
+public @interface TestDate {
+
+}

src/main/java/com/jwkj/qsydw/aspect/LoggingAspect.java

@@ -0,0 +1,43 @@
+package com.jwkj.qsydw.aspect;
+
+import com.jwkj.qsydw.annotation.Loggable;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Xu·LinPeng
+ */
+@Aspect
+@Component
+@Slf4j
+public class LoggingAspect {
+
+    //切点：使用LogAnnotation注解标识的方法都进行切入，也可以使用通配符配置具体要切入的方法名
+    @Pointcut("@annotation(loggable)")
+    public void pointCut(Loggable loggable){
+
+    }
+
+    @Around(value = "pointCut(loggable)", argNames = "joinPoint,loggable")
+    public Object logMethod(ProceedingJoinPoint joinPoint, Loggable loggable) throws Throwable {
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        String methodName = signature.getMethod().getName();
+//        String className = joinPoint.getTarget().getClass().getSimpleName();
+//        Object[] args = joinPoint.getArgs();
+
+        log.info("{}被调用",loggable.value());
+        try {
+            Object result = joinPoint.proceed();
+            log.info("{}调用成功",loggable.value());
+            return result;
+        } catch (Exception e) {
+            log.info("{} 调用失败,错误信息:{}",loggable.value(),e.getMessage());
+            throw e;
+        }
+    }
+
+}

src/main/java/com/jwkj/qsydw/controller/Djjkcrq.java

@@ -1,6 +1,7 @@
 package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -16,10 +17,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 没有点位信息
  * @author Xu·LinPeng
  */
 @RestController
 @RequestMapping("/transform")
+@Deprecated(since = "2025/2/7")
 public class Djjkcrq {
 
     @Resource
@@ -27,6 +30,7 @@ public class Djjkcrq {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/djjkcrq")
     @PostMapping("/djjkcrq")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Emss.java

@@ -1,6 +1,7 @@
 package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
@@ -18,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 甲带给料机
+ * 二煤上山
  * @author Xu·LinPeng
  */
 @RestController
@@ -30,6 +31,7 @@ public class Emss {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/emss")
     @PostMapping("/emss")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Fljyfjk.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -20,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 副立井压风
  * @author Xu·LinPeng
  */
 @RestController
@@ -31,6 +33,7 @@ public class Fljyfjk {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/fljyf")
     @PostMapping("/fljyf")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Fxjjc.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -29,6 +30,7 @@ public class Fxjjc {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/fxjjc")
     @PostMapping("/fxjjc")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Fxpd07.java

@@ -1,6 +1,7 @@
 package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
@@ -18,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 甲带给料机
+ * 07风巷皮带
  * @author Xu·LinPeng
  */
 @RestController
@@ -30,6 +31,7 @@ public class Fxpd07 {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/fxpd07")
     @PostMapping("/fxpd07")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Hrz.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -17,6 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 换热站
  * @author Xu·LinPeng
  */
 @RestController
@@ -28,6 +30,7 @@ public class Hrz {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/hrz")
     @PostMapping("/hrz")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Jdglj.java

@@ -1,6 +1,7 @@
 package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.*;
 import jakarta.annotation.Resource;
@@ -27,6 +28,7 @@ public class Jdglj {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/jdglj")
     @PostMapping("/jdglj")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Jxpd06.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
@@ -19,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 甲带给料机
+ * 06机巷皮带
  * @author Xu·LinPeng
  */
 @RestController
@@ -31,6 +32,7 @@ public class Jxpd06 {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/jxpd06")
     @PostMapping("/jxpd06")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Jxpdjk.java

@@ -1,6 +1,7 @@
 package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
@@ -18,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 甲带给料机
+ * 井下皮带监控
  * @author Xu·LinPeng
  */
 @RestController
@@ -30,6 +31,7 @@ public class Jxpdjk {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/jxpdjk")
     @PostMapping("/jxpdjk")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Rqglf.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -29,6 +30,7 @@ public class Rqglf {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/rqglf")
     @PostMapping("/rqglf")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Sbf1065.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -17,6 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 1065水泵房
  * @author Xu·LinPeng
  */
 @RestController
@@ -28,6 +30,7 @@ public class Sbf1065 {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/qsy1065sbf")
     @PostMapping("/qsy1065sbf")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Sbf786.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -17,6 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 786水泵房
  * @author Xu·LinPeng
  */
 @RestController
@@ -28,6 +30,7 @@ public class Sbf786 {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/qsy786sbf")
     @PostMapping("/qsy786sbf")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Scsgs.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.Nsvo;
@@ -30,6 +31,7 @@ public class Scsgs {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/scsgs")
     @PostMapping("/scsgs")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Shsgs.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Ndvo;
 import com.jwkj.qsydw.vo.Nsvo;
@@ -30,6 +31,7 @@ public class Shsgs {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/shsgs")
     @PostMapping("/shsgs")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Xfsgs.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Ndvo;
 import com.jwkj.qsydw.vo.Nsvo;
@@ -30,6 +31,7 @@ public class Xfsgs {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/xfsgs")
     @PostMapping("/xfsgs")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Xglfjk.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -29,6 +30,7 @@ public class Xglfjk {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/xglfjk")
     @PostMapping("/xglfjk")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Yfjk.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.Npvo;
 import com.jwkj.qsydw.vo.PointPosition;
@@ -19,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * 压风监控
  * @author Xu·LinPeng
  */
 @RestController
@@ -30,6 +32,7 @@ public class Yfjk {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/yfjk")
     @PostMapping("/yfjk")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Zdjk.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.PointPosition;
 import com.jwkj.qsydw.vo.ReadResults;
@@ -31,6 +32,7 @@ public class Zdjk {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/zdjk")
     @PostMapping("/zdjk")
     public BaseResponse<JSONObject> data(){
 

src/main/java/com/jwkj/qsydw/controller/Ztfj.java

@@ -2,6 +2,7 @@ package com.jwkj.qsydw.controller;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.jwkj.qsydw.annotation.Loggable;
 import com.jwkj.qsydw.services.HttpClientService;
 import com.jwkj.qsydw.vo.*;
 import com.jwkj.qsydw.vo.wrapper.Wrapper;
@@ -15,6 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * 主通风机
  * @author Xu·LinPeng
  */
 @RestController
@@ -26,6 +28,7 @@ public class Ztfj {
     @Resource
     PointPosition pointPosition;
 
+    @Loggable("/ztfj")
     @PostMapping("/ztfj")
     public BaseResponse<JSONObject> data(){