Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect in...

jiangping

2023-09-21 04c7bc483f55deccb2aeae621a416080fb64fe89

 server/platform/src/main/java/com/doumee/api/business/BaseGoodsController.java

@@ -7,14 +7,18 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BaseGoods;
import com.doumee.dao.business.model.dto.BaseGoodsCreateOrUpdateRequest;
import com.doumee.dao.business.model.dto.BaseGoodsDTO;
import com.doumee.service.business.BaseGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

@@ -34,7 +38,7 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:basegoods:create")
    public ApiResponse create(@RequestBody BaseGoods baseGoods) {
    public ApiResponse create(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods) {
        return ApiResponse.success(baseGoodsService.create(baseGoods));
    }

@@ -84,7 +88,70 @@
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:basegoods:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(baseGoodsService.findById(id));
    public ApiResponse<BaseGoodsDTO> findById(@PathVariable Integer id) {
        return ApiResponse.success(baseGoodsService.findByIdBaseGoods(id));
    }

    /**
     * 主键上下架
     *
     */
    @ApiOperation("根据ID查询批量上架下架")
    @PostMapping("/updateStatus")
    @RequiresPermissions("business:basegoods:update")
    public ApiResponse updateStatusByIds(@RequestBody   BaseGoods param ){
        baseGoodsService.updateStatusByIds(param);
        return ApiResponse.success("操作成功！");
    }


//    /**
//     * 主键上下架
//     *
//     * @param id 实体对象
//     */
//    @ApiOperation("上架 、下架")
//    @GetMapping("/updateStatusById")
//    @RequiresPermissions("business:basegoods:update")
//    public ApiResponse updateStatusById(@RequestParam Integer id,@RequestParam Integer status){
//        baseGoodsService.updateStatusById(id,status);
//        return ApiResponse.success(null);
//    }

    /**
     * 主键查询
     *
     * @param id 主键
     * @return BaseGoods
     */
    @ApiOperation("根据ID查询平台商品详细信息")
    @GetMapping("/findByIdBaseGoods")
    @RequiresPermissions("business:basegoods:query")
    public ApiResponse<BaseGoodsDTO> findByIdBaseGoods(@RequestParam Integer id){
        BaseGoodsDTO byIdBaseGoods = baseGoodsService.findByIdBaseGoods(id);
        return ApiResponse.success(byIdBaseGoods);
    }

    /**
     * 主键更新
     *
     * @param baseGoods 实体对象
     */
    @ApiOperation("根据ID修改-编辑修改")
    @PostMapping("/update")
    @RequiresPermissions("business:basegoods:update")
    public ApiResponse update(@RequestBody BaseGoodsCreateOrUpdateRequest baseGoods){
        baseGoodsService.update(baseGoods);
        return ApiResponse.success(null);
    }

    @ApiOperation("导入模板")
    @PostMapping("/importExcel")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
    })
    @RequiresPermissions("business:basegoods:create")
    public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
        return ApiResponse.success(baseGoodsService.importBaseGoodsBatch(file));
    }
}