#

luxiaotao1123

2022-04-23 118d83c4768b58a42bc54ab73967f53b930b63d7

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -1,21 +1,20 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.entity.param.PackParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.IpTools;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -35,8 +34,6 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private ApiLogService apiLogService;



@@ -46,24 +43,14 @@


    @PostMapping("/order/pakin/new/package/v1")
    @AppAuth(memo = "打包上线接口")
    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
                                            @RequestParam(required = false) String barcode,
                                            HttpServletRequest request) {
        auth(appkey, barcode);
        if (Cools.isEmpty(barcode)) {
                                            @RequestBody(required = false) PackParam param) {
        auth(appkey, param);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.packageUp(barcode);
        // 保存接口日志
        apiLogService.save(
                "打包上线接口",
                request.getRequestURI(),
                appkey,
                IpTools.gainRealIp(request),
                barcode,
                JSON.toJSONString(R.ok()),
                Boolean.TRUE
        );
        openService.packageUp(param);
        return R.ok();
    }

@@ -106,6 +93,7 @@
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakoutParam param) {
        auth(appkey, param);
@@ -147,7 +135,7 @@


    private void auth(String appkey, Object obj) {
        log.info("{}接口被访问！appkey:{},请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        if (!auth) {
            return;
        }