diff --git a/src/main/java/com/eleadmin/common/goods/controller/GoodsController.java b/src/main/java/com/eleadmin/common/goods/controller/GoodsController.java index e3894f5..8ad657a 100644 --- a/src/main/java/com/eleadmin/common/goods/controller/GoodsController.java +++ b/src/main/java/com/eleadmin/common/goods/controller/GoodsController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.eleadmin.common.core.annotation.OperationLog; import com.eleadmin.common.core.web.ApiResult; import com.eleadmin.common.core.web.BaseController; -import com.eleadmin.common.core.web.PageParam; import com.eleadmin.common.core.web.PageResult; import com.eleadmin.common.goods.entity.Goods; import com.eleadmin.common.goods.param.GoodsParam; @@ -13,17 +12,13 @@ import com.eleadmin.common.goods.service.GoodsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import javax.validation.Valid; -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * 商品控制器 @@ -67,6 +62,7 @@ public class GoodsController extends BaseController { boolean save = goodsService.save(goods); return save?success():fail(); } + @PreAuthorize("hasAnyAuthority('goods:update')") @OperationLog @ApiOperation("修改商品") @@ -92,7 +88,6 @@ public class GoodsController extends BaseController { return b?success():fail(); } - @PreAuthorize("hasAnyAuthority('goods:remove')") @OperationLog @ApiOperation("批量删除商品") @@ -103,7 +98,23 @@ public class GoodsController extends BaseController { boolean b = goodsService.removeByIds(list); return b?success():fail(); } - + @PreAuthorize("hasAnyAuthority('goods:save')") + @OperationLog + @ApiOperation("添加表格商品") + @PostMapping("/addBath") + public ApiResult saveBath(@Valid @RequestBody List goods, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + throw new RuntimeException(bindingResult.getAllErrors().get(0).getDefaultMessage()); + } + if (!CollectionUtils.isEmpty(goods)){ + goods.stream().forEach(g->{ + g.setGoodId(UUID.randomUUID().toString().replace("-","")); + }); + boolean save = goodsService.saveBatch(goods); + return save?success():fail(); + } + return fail("数据不能为空"); + } }