日志系统更新

lms/nladmin-system/src/main/java/org/nl/modules/logging/InterfaceLogType.java

@@ -0,0 +1,28 @@
+package org.nl.modules.logging;
+
+/**
+ * @author: lyd
+ * @description:
+ * @Date: 2022/10/11
+ */
+public enum InterfaceLogType {
+    DEFAULT("默认"),
+    LMS_TO_MES("LMS请求MES"),
+    MES_TO_LMS("MES请求LMS"),
+    LMS_TO_CRM("LMS请求CRM"),
+    CRM_TO_LMS("CRM请求LMS"),
+    LMS_TO_SAP("LMS请求SAP"),
+    SAP_TO_LMS("SAP请求LMS"),
+    LMS_TO_ACS("LMS请求ACS"),
+    ACS_TO_LMS("ACS请求LMS");
+
+    private String desc;
+
+    InterfaceLogType(String desc) {
+    this.desc=desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

lms/nladmin-system/src/main/java/org/nl/modules/logging/annotation/Log.java

@@ -15,6 +15,8 @@
  */
 package org.nl.modules.logging.annotation;
 
+import org.nl.modules.logging.InterfaceLogType;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -28,4 +30,33 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Log {
     String value() default "";
+
+    /**
+     * 是否打印到日志文件
+     *
+     * @return
+     */
+    boolean isPrintToLogFile() default false;
+
+
+    /**
+     * 是否插入操作日志表
+     *
+     * @return
+     */
+    boolean isAddLogTable() default true;
+
+    /**
+     * 是否接口日志
+     *
+     * @return
+     */
+    boolean isInterfaceLog() default false;
+
+    /**
+     * 接口日志类型
+     *
+     * @return
+     */
+    InterfaceLogType interfaceLogType() default InterfaceLogType.DEFAULT;
 }

lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -18,6 +18,7 @@ package org.nl.modules.logging.aspect;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
@@ -25,12 +26,14 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.nl.modules.common.utils.RequestHolder;
+import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.utils.RequestHolder;
 import org.nl.modules.common.utils.StringUtils;
 import org.nl.modules.common.utils.ThrowableUtil;
 import org.nl.modules.logging.domain.Log;
 import org.nl.modules.logging.service.LogService;
+import org.nl.modules.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -79,17 +82,60 @@ public class LogAspect {
         Method method = signature.getMethod();
         // 方法路径
         String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-        String params=getParameter(method, joinPoint.getArgs());
-        log.info("请求方法:{}",methodName);
-        log.info("请求方法参数:{}",params);
+        String params = getParameter(method, joinPoint.getArgs());
+
+        org.nl.modules.logging.annotation.Log logInfo = method.getAnnotation(org.nl.modules.logging.annotation.Log.class);
+
+        //是否输出到日志文件
+        if (logInfo.isPrintToLogFile()) {
+            log.info("请求方法:{}", methodName);
+            log.info("请求方法参数:{}", params);
+        }
+
 
         Object result;
         currentTime.set(System.currentTimeMillis());
         result = joinPoint.proceed();
-        Log log = new Log("INFO",System.currentTimeMillis() - currentTime.get());
-        currentTime.remove();
+
         HttpServletRequest request = RequestHolder.getHttpServletRequest();
-        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request),joinPoint, log);
+
+        String requestIp = StringUtils.getIp(request);
+        //是否把日志存到日志表
+        if (logInfo.isAddLogTable()) {
+            Log log = new Log("INFO", System.currentTimeMillis() - currentTime.get());
+            currentTime.remove();
+
+
+            logService.save(getUsername(), StringUtils.getBrowser(request), requestIp, joinPoint, log);
+        }
+
+
+        //保存到接口日志表
+        if (logInfo.isInterfaceLog()) {
+            try {
+                System.out.println("日志存储到接口日志表!");
+                WQLObject interfaceLog = WQLObject.getWQLObject("sys_interface_log");
+                JSONObject json = new JSONObject();
+                json.put("log_id", IdUtil.getStringId());
+                json.put("description", logInfo.value());
+                json.put("log_type", logInfo.interfaceLogType().getDesc());
+                json.put("log_level", "1");
+                json.put("method", methodName);
+                json.put("params", getParameter(method, joinPoint.getArgs()));
+                json.put("request_ip", StringUtils.getIp(request));
+                json.put("time", 10);
+                json.put("username", getUsername());
+                json.put("address", StringUtils.getCityInfo(requestIp));
+                json.put("browser", StringUtils.getBrowser(request));
+                json.put("exception_detail", IdUtil.getStringId());
+                json.put("create_time", IdUtil.getStringId());
+                json.put("return_result", JSONObject.fromObject(result).getJSONObject("body"));
+                interfaceLog.insert(json);
+            } catch (Exception e) {
+                System.out.println("接口日志保存异常!"+e.getMessage());
+            }
+        }
+
         return result;
     }
 
@@ -127,21 +173,21 @@ public class LogAspect {
      * 配置异常通知
      *
      * @param joinPoint join point for advice
-     * @param e exception
+     * @param e         exception
      */
     @AfterThrowing(pointcut = "logPointcut()", throwing = "e")
     public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
-        Log log = new Log("ERROR",System.currentTimeMillis() - currentTime.get());
+        Log log = new Log("ERROR", System.currentTimeMillis() - currentTime.get());
         currentTime.remove();
         log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes());
         HttpServletRequest request = RequestHolder.getHttpServletRequest();
-        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log);
+        logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
     }
 
     public String getUsername() {
         try {
             return SecurityUtils.getCurrentUsername();
-        }catch (Exception e){
+        } catch (Exception e) {
             return "";
         }
     }

lms/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java

@@ -0,0 +1,40 @@
+package org.nl.modules.logging.rest;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.logging.service.InterfaceLogService;
+import org.nl.wms.sch.service.PointService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author ldjun
+ * @version 1.0
+ * @date 2023年01月29日 18:55
+ * @desc desc
+ */
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/interfaceLog")
+@Api(tags = "系统：接口日志管理")
+public class InterfaceLogController {
+    private final InterfaceLogService interfaceLogService;
+
+    @GetMapping
+    @Log("查询接口日志")
+    @ApiOperation("查询接口日志")
+    //@SaCheckPermission("point:list")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(interfaceLogService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+}

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/InterfaceLogService.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.nl.modules.logging.service;
+
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-24
+ */
+public interface InterfaceLogService {
+
+    /**
+     * 查询数据分页
+     * @param whereJson 条件
+     * @param page 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> queryAll(Map whereJson, Pageable page);
+
+
+}

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/InterfaceLogServiceImpl.java

@@ -0,0 +1,47 @@
+/*
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.nl.modules.logging.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.service.InterfaceLogService;
+import org.nl.modules.wql.core.bean.ResultBean;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-24
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class InterfaceLogServiceImpl implements InterfaceLogService {
+
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable pageable) {
+        String where = "1=1";
+        ResultBean rb = WQLObject.getWQLObject("sys_interface_log").pagequery(WqlUtil.getHttpContext(pageable), where, "create_time desc ");
+        final JSONObject json = rb.pageResult();
+        return json;
+    }
+}