#

cp

2024-07-08 4a70415aff0ae2681d76bd131188ecf0f4ce921e

#

 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/config/AspectConfig.java

@@ -1,11 +1,16 @@
package com.zy.asrs.openapi.config;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.common.openapi.service.ApiLogService;
import com.zy.asrs.common.utils.IpTools;
import com.zy.asrs.framework.common.R;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -22,6 +27,9 @@
@Aspect
@Slf4j
public class AspectConfig {

    @Autowired
    private ApiLogService apiLogService;

    @Pointcut("execution(* com.zy.asrs.openapi.controller..*.*(..))")
    private void webLog() {
@@ -40,6 +48,20 @@
        long start = System.currentTimeMillis();
        Object result = joinPoint.proceed(joinPoint.getArgs());
        log.info("请求响应参数{}", JSONObject.toJSONString(result));

        // 保存接口日志
        Object appAuth = request.getAttribute("appAuth");
        String appkey = request.getHeader("appkey");
        apiLogService.saveLog(
                String.valueOf(appAuth),
                request.getRequestURI(),
                appkey,
                IpTools.gainRealIp(request),
                JSONObject.toJSONString(filterArgs(joinPoint.getArgs())),
                JSON.toJSONString(result),
                String.valueOf(((R) result).get("code")).equalsIgnoreCase("200")
        );

        long end = System.currentTimeMillis();
        log.info("执行耗时:{}", end - start);
        return result;

 zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js

@@ -10,7 +10,7 @@
        ,{field: 'anfme', align: 'center',title: '数量', width: 100}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'memo', align: 'center',title: '翻包'}
        ,{field: 'owner$', align: 'center',title: '拥有者'}
        // ,{field: 'owner$', align: 'center',title: '拥有者'}

        ,{field: 'specs', align: 'center',title: '配置'}
        ,{field: 'model', align: 'center',title: '代码', hide: true}