#

1

4 天以前 39375b057d1c775b4e063e8fa2eeaf8c4627812c

#

 src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java

@@ -17,12 +17,14 @@
    private String staNo;
    private String orderNo;
    private String sku;
    private Long bindingTags;

    public void OrderIdTwo(String sign_order,String sign_sku){
        String[] split = order_id.split(Pattern.quote(sign_order));
        staNo = split[1];
        String[] split1 = split[0].split(Pattern.quote(sign_sku));
        orderNo = split1[1];
        orderNo = split1[2];
        sku = split1[0];
        bindingTags = Long.parseLong(split1[1]);
    }
}

 src/main/java/com/zy/asrs/entity/param/TaskArmCycleResultParam.java

@@ -17,12 +17,14 @@
    private String staNo;
    private String orderNo;
    private String sku;
    private Long bindingTags;

    public void OrderIdTwo(String sign_order,String sign_sku){
        String[] split = order_id.split(Pattern.quote(sign_order));
        staNo = split[1];
        String[] split1 = split[0].split(Pattern.quote(sign_sku));
        orderNo = split1[1];
        orderNo = split1[2];
        sku = split1[0];
        bindingTags = Long.parseLong(split1[1]);
    }
}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -641,6 +641,7 @@
                    new EntityWrapper<BasArmMastSign>()
                            .eq("matnr", param.getSku())
                            .eq("order_no", param.getOrderNo())
                            .eq("create_time", param.getBindingTags())
            );
            if (!Cools.isEmpty(basArmMastSign)){
                basArmMastSign.setStatus(1);
@@ -730,19 +731,10 @@
    @Override
    @Transactional
    public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
        BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()
                        .eq("matnr", param.getSku())
                        .eq("order_no", param.getOrderNo())
        );
        if (Cools.isEmpty(basArmMastSign)){
//            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
            return false;
        }
        BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()
                        .eq("order_no", param.getOrderNo())
                        .eq("create_time", basArmMastSign.getCreateTime())
                        .eq("create_time", param.getBindingTags())
                        .eq("status", 0)
        );
        if (Cools.isEmpty(basArmMastSignNew)){

 src/main/java/com/zy/common/config/ControllerResAdvice.java

@@ -1,8 +1,11 @@
package com.zy.common.config;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.common.utils.IpTools;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +23,7 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Date;

/**
 * 返回值处理
@@ -47,16 +51,28 @@
                    String appkey = request.getHeader("appkey");
                    Object reqCache = request.getAttribute("cache");
                    if (!Cools.isEmpty(appkey)) {
                        // 保存接口日志
                        apiLogService.save(
                                String.valueOf(appAuth),
                                request.getRequestURI(),
                                appkey,
                                IpTools.gainRealIp(request),
                                reqCache==null?"": JSON.toJSONString(reqCache),
                                JSON.toJSONString(o),
                                String.valueOf(((R) o).get("code")).equalsIgnoreCase("200")
                        );
                        boolean success = String.valueOf(((R) o).get("code")).equalsIgnoreCase("200");
                        if (success){
                            // 保存接口日志
                            apiLogService.save(
                                    String.valueOf(appAuth),
                                    request.getRequestURI(),
                                    appkey,
                                    IpTools.gainRealIp(request),
                                    reqCache==null?"": JSON.toJSONString(reqCache),
                                    JSON.toJSONString(o),
                                    success
                            );
                        } else {
                            beforeBodyWriteCallApiLogSave(
                                    String.valueOf(appAuth),
                                    request.getRequestURI(),
                                    appkey,
                                    IpTools.gainRealIp(request),
                                    reqCache==null?"": JSON.toJSONString(reqCache),
                                    JSON.toJSONString(o),
                                    success);
                        }
                    }
                }
            }
@@ -64,6 +80,38 @@
        return o;
    }

    public void beforeBodyWriteCallApiLogSave(String name, String url, String appkey, String ip, String request, String response, boolean success) {
        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);

        ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>()
                .eq("namespace", name)
                .eq("request", request)
                .eq("response", response)
                .eq("ip", ip)
                .eq("url", url)
                .eq("appkey", appkey)
                .eq("result", success? 1:0)
                .orderBy("create_time", false)
        );

        if (!Cools.isEmpty(apiLog)){
            long parseLong = Long.parseLong(apiLog.getTimestamp());
            if (new Date().getTime()-parseLong<5*1000*60){
                return;
            }
        }
        // 保存接口日志
        apiLogService.save(
                name,
                url,
                appkey,
                ip,
                request,
                response,
                success
        );
    }

    public static String json(HttpServletRequest request) {
        try {
            BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));