Merge remote-tracking branch 'origin/stasrs' into stasrs

野心家

2023-04-24 f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd

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

@@ -1,15 +1,18 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -103,9 +106,10 @@
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        @RequestBody StockVo stockVo,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
        auth(appkey, stockVo, request);
        return R.ok().add(openService.queryStock(stockVo));
    }

    private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -169,6 +173,22 @@
    }


    @RequestMapping("/manDetl/in")
    public R manDetlAdd(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
        }
        return openService.manDetlIn(json);
    }


    @RequestMapping("/manDetl/out")
    public R manDetlDelete(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
        }
        return openService.manDetlOut(json);
    }