BI记录代码优化

aipt-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.AIPT_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.AIPT_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

bi-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.BI_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.BI_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

common/src/main/java/com/diagbot/log/entity/BiRecord.java

@@ -84,6 +84,11 @@ public class BiRecord {
      */
     private String result;
 
+    /**
+     * 响应时间
+     */
+    private String execTime;
+
     /**
      * 调用是否成功（0：失败；1：成功）
      */

common/src/main/java/com/diagbot/util/AopUtil.java

@@ -12,6 +12,7 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.log.entity.SysLog;
 import com.diagbot.vo.BaseBiVO;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
@@ -35,7 +36,7 @@ public class AopUtil {
      * @param joinPoint
      * @param sysType
      */
-    public static SysLog SysLoggerAspect(JoinPoint joinPoint, Integer sysType) {
+    public static SysLog sysLoggerAspect(JoinPoint joinPoint, Integer sysType) {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
 
@@ -76,7 +77,7 @@ public class AopUtil {
      * @param joinPoint
      * @param sysType
      */
-    public static SysLog SysLoggerExprotAspect(JoinPoint joinPoint, Integer sysType) {
+    public static SysLog sysLoggerExprotAspect(JoinPoint joinPoint, Integer sysType) {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
 
@@ -115,24 +116,30 @@ public class AopUtil {
     /**
      * Bi日志有返回值处理（普通）
      *
+     * @param biRecord
      * @param joinPoint
-     * @param keys
      * @param productType
      * @return
+     * @throws Throwable
      */
-    public static BiRecord BiLoggerAspect(JoinPoint joinPoint, Object keys, Integer productType) {
-        BiRecord biRecord = new BiRecord();
+    public static Object biLoggerAspect(BiRecord biRecord, ProceedingJoinPoint joinPoint,
+                                        Integer productType) throws Throwable {
+        long start = System.currentTimeMillis();
+        Object object = joinPoint.proceed();
         if (!biRecordSet(biRecord, joinPoint, productType, BiSourceEnum.BI_NORMAL.getKey())) {
-            return null;
+            biRecord = null;
+            return object;
         }
         //出参设置
         String result = "";
-        result = FastJsonUtils.getBeanToJson(keys);
+        result = FastJsonUtils.getBeanToJson(object);
         if (!StringUtil.isEmpty(result)) {
             biRecord.setResult(result);
         }
         biRecord.setSuccessFlag(1);
-        return biRecord;
+        long execTime = System.currentTimeMillis() - start;
+        biRecord.setExecTime(String.valueOf(execTime));
+        return object;
     }
 
     /**
@@ -143,7 +150,7 @@ public class AopUtil {
      * @param productType
      * @return
      */
-    public static BiRecord BiLoggerAspectThrow(JoinPoint joinPoint, Throwable ex, Integer productType) {
+    public static BiRecord biLoggerAspectThrow(JoinPoint joinPoint, Throwable ex, Integer productType) {
         BiRecord biRecord = new BiRecord();
         if (!biRecordSet(biRecord, joinPoint, productType, BiSourceEnum.BI_NORMAL.getKey())) {
             return null;
@@ -159,33 +166,39 @@ public class AopUtil {
     /**
      * Bi日志有返回值处理（特殊）
      *
+     * @param biRecord
      * @param joinPoint
-     * @param keys
      * @param productType
      * @return
+     * @throws Throwable
      */
-    public static BiRecord BiLoggerResultAspect(JoinPoint joinPoint, Object keys, Integer productType) {
-        BiRecord biRecord = new BiRecord();
+    public static Object biLoggerResultAspect(BiRecord biRecord, ProceedingJoinPoint joinPoint,
+                                              Integer productType) throws Throwable {
+        long start = System.currentTimeMillis();
+        Object object = joinPoint.proceed();
         if (!biRecordSet(biRecord, joinPoint, productType, BiSourceEnum.BI_RESULT.getKey())) {
-            return null;
+            biRecord = null;
+            return object;
         }
         //出参设置
         String result = "";
-        if (keys instanceof RespDTO) {
-            RespDTO respDTO = (RespDTO) keys;
+        if (object instanceof RespDTO) {
+            RespDTO respDTO = (RespDTO) object;
             RespDTO rs = new RespDTO();
             rs.code = respDTO.code;
             rs.msg = respDTO.msg;
             rs.data = new Object();
             result = FastJsonUtils.getBeanToJson(rs);
         } else {
-            result = FastJsonUtils.getBeanToJson(keys);
+            result = FastJsonUtils.getBeanToJson(object);
         }
         if (!StringUtil.isEmpty(result)) {
             biRecord.setResult(result);
         }
         biRecord.setSuccessFlag(1);
-        return biRecord;
+        long execTime = System.currentTimeMillis() - start;
+        biRecord.setExecTime(String.valueOf(execTime));
+        return object;
     }
 
     /**
@@ -196,7 +209,7 @@ public class AopUtil {
      * @param productType
      * @return
      */
-    public static BiRecord BiLoggerResultAspectThrow(JoinPoint joinPoint, Throwable ex, Integer productType) {
+    public static BiRecord biLoggerResultAspectThrow(JoinPoint joinPoint, Throwable ex, Integer productType) {
         BiRecord biRecord = new BiRecord();
         if (!biRecordSet(biRecord, joinPoint, productType, BiSourceEnum.BI_RESULT.getKey())) {
             return null;
@@ -312,7 +325,6 @@ public class AopUtil {
         }
         resp.code = CommonErrorCode.FAIL.getCode();
         resp.msg = e.getMessage();
-        e.printStackTrace();
         return resp;
     }
 }

data-service/src/main/java/com/diagbot/aop/BiLoggerAspect.java

@@ -4,9 +4,11 @@ import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
+@Slf4j
 public class BiLoggerAspect {
     @Autowired
     private MySender mySender;
@@ -27,19 +30,21 @@ public class BiLoggerAspect {
     public void biPointCut() {
     }
 
-    @AfterReturning(value = "biPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerAspect(joinPoint, keys, ProductTypeEnum.DATA.getKey());
+    @Around(value = "biPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerAspect(biRecord, joinPoint, ProductTypeEnum.DATA.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.DATA.getKey());
+        BiRecord biRecord = AopUtil.biLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.DATA.getKey());
         if (null == biRecord) {
             return;
         }

data-service/src/main/java/com/diagbot/aop/BiLoggerResultAspect.java

@@ -5,8 +5,9 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,19 +28,21 @@ public class BiLoggerResultAspect {
     public void biResultPointCut() {
     }
 
-    @AfterReturning(value = "biResultPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspect(joinPoint, keys, ProductTypeEnum.DATA.getKey());
+    @Around(value = "biResultPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerResultAspect(biRecord, joinPoint, ProductTypeEnum.DATA.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biResultPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.DATA.getKey());
+        BiRecord biRecord = AopUtil.biLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.DATA.getKey());
         if (null == biRecord) {
             return;
         }

data-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.DATA_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.DATA_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

diagbotman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.DIAGBOTMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.DIAGBOTMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

diagbotman-service/src/main/java/com/diagbot/aop/SysLoggerExprotAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerExprotAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerExprotAspect(joinPoint, SysTypeEnum.DIAGBOTMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerExprotAspect(joinPoint, SysTypeEnum.DIAGBOTMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

feedback-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.FEEDBACK_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.FEEDBACK_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

icss-service/src/main/java/com/diagbot/aop/BiLoggerAspect.java

@@ -4,9 +4,11 @@ import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
+@Slf4j
 public class BiLoggerAspect {
     @Autowired
     private MySender mySender;
@@ -27,19 +30,21 @@ public class BiLoggerAspect {
     public void biPointCut() {
     }
 
-    @AfterReturning(value = "biPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerAspect(joinPoint, keys, ProductTypeEnum.ICSS.getKey());
+    @Around(value = "biPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerAspect(biRecord, joinPoint, ProductTypeEnum.ICSS.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.ICSS.getKey());
+        BiRecord biRecord = AopUtil.biLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.ICSS.getKey());
         if (null == biRecord) {
             return;
         }

icss-service/src/main/java/com/diagbot/aop/BiLoggerResultAspect.java

@@ -5,8 +5,9 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,19 +28,21 @@ public class BiLoggerResultAspect {
     public void biResultPointCut() {
     }
 
-    @AfterReturning(value = "biResultPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspect(joinPoint, keys, ProductTypeEnum.ICSS.getKey());
+    @Around(value = "biResultPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerResultAspect(biRecord, joinPoint, ProductTypeEnum.ICSS.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biResultPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.ICSS.getKey());
+        BiRecord biRecord = AopUtil.biLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.ICSS.getKey());
         if (null == biRecord) {
             return;
         }

icss-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.ICSS_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.ICSS_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

icss-service/src/main/java/com/diagbot/aop/SysLoggerExprotAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerExprotAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerExprotAspect(joinPoint, SysTypeEnum.ICSS_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerExprotAspect(joinPoint, SysTypeEnum.ICSS_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

icssman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.ICSSMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.ICSSMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

knowledgeman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

knowledgeman-service/src/main/java/com/diagbot/aop/SysLoggerExprotAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerExprotAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerExprotAspect(joinPoint, SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerExprotAspect(joinPoint, SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

log-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.LOG_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.LOG_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

log-service/src/main/java/com/diagbot/entity/BiRecord.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author gaodm
- * @since 2019-11-18
+ * @since 2019-11-19
  */
 @TableName("log_bi_record")
 public class BiRecord implements Serializable {
@@ -91,6 +91,11 @@ public class BiRecord implements Serializable {
      */
     private String result;
 
+    /**
+     * 响应时间
+     */
+    private String execTime;
+
     /**
      * 调用是否成功（0：失败；1：成功）
      */
@@ -213,6 +218,14 @@ public class BiRecord implements Serializable {
         this.result = result;
     }
 
+    public String getExecTime() {
+        return execTime;
+    }
+
+    public void setExecTime(String execTime) {
+        this.execTime = execTime;
+    }
+
     public Integer getSuccessFlag() {
         return successFlag;
     }
@@ -246,6 +259,7 @@ public class BiRecord implements Serializable {
                 ", code=" + code +
                 ", params=" + params +
                 ", result=" + result +
+                ", execTime=" + execTime +
                 ", successFlag=" + successFlag +
                 ", source=" + source +
                 "}";

log-service/src/main/resources/mapper/BiRecordMapper.xml

@@ -13,10 +13,12 @@
         <result column="hospital_code" property="hospitalCode" />
         <result column="doctor_code" property="doctorCode" />
         <result column="dept_code" property="deptCode" />
+        <result column="patient_code" property="patientCode" />
         <result column="product_type" property="productType" />
         <result column="code" property="code" />
         <result column="params" property="params" />
         <result column="result" property="result" />
+        <result column="exec_time" property="execTime" />
         <result column="success_flag" property="successFlag" />
         <result column="source" property="source" />
     </resultMap>

ltapi-service/src/main/java/com/diagbot/aop/BiLoggerAspect.java

@@ -4,9 +4,11 @@ import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
+@Slf4j
 public class BiLoggerAspect {
     @Autowired
     private MySender mySender;
@@ -27,19 +30,21 @@ public class BiLoggerAspect {
     public void biPointCut() {
     }
 
-    @AfterReturning(value = "biPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerAspect(joinPoint, keys, ProductTypeEnum.LTAPI.getKey());
+    @Around(value = "biPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerAspect(biRecord, joinPoint, ProductTypeEnum.LTAPI.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.LTAPI.getKey());
+        BiRecord biRecord = AopUtil.biLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.LTAPI.getKey());
         if (null == biRecord) {
             return;
         }

ltapi-service/src/main/java/com/diagbot/aop/BiLoggerResultAspect.java

@@ -5,8 +5,9 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,19 +28,21 @@ public class BiLoggerResultAspect {
     public void biResultPointCut() {
     }
 
-    @AfterReturning(value = "biResultPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspect(joinPoint, keys, ProductTypeEnum.LTAPI.getKey());
+    @Around(value = "biResultPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerResultAspect(biRecord, joinPoint, ProductTypeEnum.LTAPI.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biResultPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.LTAPI.getKey());
+        BiRecord biRecord = AopUtil.biLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.LTAPI.getKey());
         if (null == biRecord) {
             return;
         }

ltapi-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.LTAPI_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.LTAPI_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

prec-service/src/main/java/com/diagbot/aop/BiLoggerAspect.java

@@ -4,9 +4,11 @@ import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
+@Slf4j
 public class BiLoggerAspect {
     @Autowired
     private MySender mySender;
@@ -27,19 +30,21 @@ public class BiLoggerAspect {
     public void biPointCut() {
     }
 
-    @AfterReturning(value = "biPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerAspect(joinPoint, keys, ProductTypeEnum.PREC.getKey());
+    @Around(value = "biPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerAspect(biRecord, joinPoint, ProductTypeEnum.PREC.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.PREC.getKey());
+        BiRecord biRecord = AopUtil.biLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.PREC.getKey());
         if (null == biRecord) {
             return;
         }

prec-service/src/main/java/com/diagbot/aop/BiLoggerResultAspect.java

@@ -5,8 +5,9 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,19 +28,21 @@ public class BiLoggerResultAspect {
     public void biResultPointCut() {
     }
 
-    @AfterReturning(value = "biResultPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspect(joinPoint, keys, ProductTypeEnum.PREC.getKey());
+    @Around(value = "biResultPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerResultAspect(biRecord, joinPoint, ProductTypeEnum.PREC.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biResultPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.PREC.getKey());
+        BiRecord biRecord = AopUtil.biLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.PREC.getKey());
         if (null == biRecord) {
             return;
         }

prec-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.PREC_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.PREC_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

prec-service/src/main/java/com/diagbot/vo/QuestionUsualVO.java

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class QuestionUsualVO {
+public class QuestionUsualVO extends BaseBiVO{
 
     @NotNull(message = "请输入科室名称")
     private String deptName;

prec-service/src/main/java/com/diagbot/vo/QuestionVO.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QuestionVO {
+public class QuestionVO extends BaseBiVO {
     private Long id;
     private Integer sexType;
     private Integer age;

prec-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -1,6 +1,8 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.BiLogger;
+import com.diagbot.annotation.BiLoggerResult;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.QuestionFacade;
@@ -38,6 +40,7 @@ public class QuestionInfoController {
                     "sexType：性别，1：男，2：女<br>" +
                     "age：年龄")
     @PostMapping("/getById")
+    @BiLoggerResult("PREC0003")
     public RespDTO<QuestionDTO> getById(@RequestBody QuestionVO questionVO) {
         QuestionDTO data = questionFacade.getById(questionVO);
         return RespDTO.onSuc(data);

prec-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -1,6 +1,8 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.BiLogger;
+import com.diagbot.annotation.BiLoggerResult;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.QuestionUsualDTO;
 import com.diagbot.dto.RespDTO;
@@ -41,6 +43,7 @@ public class QuestionUsualController {
                     "<br>")
     @PostMapping("/getQuestionUsual")
     @SysLogger("getQuestionUsual")
+    @BiLoggerResult("PREC0001")
     public RespDTO<List<QuestionUsualDTO>> getQuestionUsual(@RequestBody @Valid QuestionUsualVO questionUsualVO) {
         List<QuestionUsualDTO> data = questionUsualFacade.getQuestionUsual(questionUsualVO);
         return RespDTO.onSuc(data);

precman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.PRECMAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.PRECMAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

tran-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.TRAN_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.TRAN_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

triage-service/src/main/java/com/diagbot/aop/BiLoggerAspect.java

@@ -4,9 +4,11 @@ import com.diagbot.enums.ProductTypeEnum;
 import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Component;
  */
 @Aspect
 @Component
+@Slf4j
 public class BiLoggerAspect {
     @Autowired
     private MySender mySender;
@@ -27,19 +30,21 @@ public class BiLoggerAspect {
     public void biPointCut() {
     }
 
-    @AfterReturning(value = "biPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerAspect(joinPoint, keys, ProductTypeEnum.TRIAGE.getKey());
+    @Around(value = "biPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerAspect(biRecord, joinPoint, ProductTypeEnum.TRIAGE.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.TRIAGE.getKey());
+        BiRecord biRecord = AopUtil.biLoggerAspectThrow(joinPoint, ex, ProductTypeEnum.TRIAGE.getKey());
         if (null == biRecord) {
             return;
         }

triage-service/src/main/java/com/diagbot/aop/BiLoggerResultAspect.java

@@ -5,8 +5,9 @@ import com.diagbot.log.entity.BiRecord;
 import com.diagbot.rabbit.MySender;
 import com.diagbot.util.AopUtil;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,19 +28,21 @@ public class BiLoggerResultAspect {
     public void biResultPointCut() {
     }
 
-    @AfterReturning(value = "biResultPointCut()", returning = "keys")
-    public void saveBiRecord(JoinPoint joinPoint, Object keys) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspect(joinPoint, keys, ProductTypeEnum.TRIAGE.getKey());
+    @Around(value = "biResultPointCut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        BiRecord biRecord = new BiRecord();
+        Object object = AopUtil.biLoggerResultAspect(biRecord, joinPoint, ProductTypeEnum.TRIAGE.getKey());
         if (null == biRecord) {
-            return;
+            return object;
         }
         //保存BI日志
         mySender.outputBiLogSend(biRecord);
+        return object;
     }
 
     @AfterThrowing(pointcut = "biResultPointCut()", throwing = "ex")
     public void saveBiRecordThrow(JoinPoint joinPoint, Throwable ex) {
-        BiRecord biRecord = AopUtil.BiLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.TRIAGE.getKey());
+        BiRecord biRecord = AopUtil.biLoggerResultAspectThrow(joinPoint, ex, ProductTypeEnum.TRIAGE.getKey());
         if (null == biRecord) {
             return;
         }

triage-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.TRIAGE_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.TRIAGE_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

user-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerAspect(joinPoint, SysTypeEnum.USER_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.USER_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }

user-service/src/main/java/com/diagbot/aop/SysLoggerExprotAspect.java

@@ -30,7 +30,7 @@ public class SysLoggerExprotAspect {
     @Before("loggerPointCut()")
     public void saveSysLog(JoinPoint joinPoint) {
         //入参设置
-        SysLog sysLog = AopUtil.SysLoggerExprotAspect(joinPoint, SysTypeEnum.USER_SERVICE.getKey());
+        SysLog sysLog = AopUtil.sysLoggerExprotAspect(joinPoint, SysTypeEnum.USER_SERVICE.getKey());
         //保存系统日志
         mySender.outputLogSend(sysLog);
     }