feat:新增花型号管理

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/OemController.java

@@ -1,5 +1,6 @@
 package org.dromara.commodityManagement.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.vo.OemVo;
@@ -25,6 +26,7 @@ public class OemController extends BaseController {
      * @param pageQuery 分页信息
      * @return 查询结果
      */
+    @SaIgnore
     @GetMapping()
     public TableDataInfo<OemVo> selectPageOemList(OemBo oem, PageQuery pageQuery) {
         return oemService.selectPageOemList(oem, pageQuery);
@@ -34,6 +36,7 @@ public class OemController extends BaseController {
      * @param oem 花型号Bo对象
      * @return 新增结果
      */
+    @SaIgnore
     @PostMapping()
     public R<Void> insertOem(@RequestBody OemBo oem) {
         return toAjax(oemService.insertOem(oem));
@@ -43,17 +46,19 @@ public class OemController extends BaseController {
      * @param oem 花型号Bo对象
      * @return 修改结果
      */
+    @SaIgnore
     @PutMapping()
     public R<Void> updateOem(@RequestBody OemBo oem) {
         return toAjax(oemService.updateOem(oem));
     }
     /**
      * 删除花型号
-     * @param oemId 花型号Id
+     * @param oemIds 花型号Id
      * @return 删除结果
      */
-    @DeleteMapping()
-    public R<Void> deleteOemByIds(@RequestParam int oemId) {
-        return toAjax(oemService.deleteOemById(oemId));
+    @SaIgnore
+    @DeleteMapping("/{oemIds}")
+    public R<Void> deleteOemByIds(@PathVariable Long[] oemIds) {
+        return toAjax(oemService.deleteOemById(oemIds));
     }
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Brand.java

@@ -13,7 +13,7 @@ public class Brand{
      * 品牌ID
      */
     @TableId("id")
-    private BigInteger id;
+    private Long id;
 
     /**
      *租户ID

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/Oem.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigInteger;
+
 @Data
 @TableName("fa_oem")
 public class Oem {
@@ -12,6 +14,10 @@ public class Oem {
      */
     @TableId("id")
     private Long id;
+    /**
+     * 租户ID
+     */
+    private BigInteger tenant_id;
     /**
      * 花型号名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/bo/OemBo.java

@@ -6,6 +6,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Oem;
 
+import java.math.BigInteger;
+
 /**
  * 花型号对象
  */
@@ -17,6 +19,10 @@ public class OemBo {
      */
     @TableId("id")
     private Long id;
+    /**
+     *租户ID
+     */
+    private BigInteger tenant_id;
     /**
      * 花型号名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/BrandVo.java

@@ -18,7 +18,7 @@ public class BrandVo {
      * 品牌ID
      */
     @TableId("id")
-    private int id;
+    private Long id;
 
     /**
      *租户ID

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/OemVo.java

@@ -5,6 +5,8 @@ import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.commodityManagement.domain.Oem;
 
+import java.math.BigInteger;
+
 /**
  * 花型号值对象
  */
@@ -16,6 +18,10 @@ public class OemVo {
      */
     @TableId("id")
     private Long id;
+    /**
+     *租户ID
+     */
+    private BigInteger tenant_id;
     /**
      * 花类型名称
      */

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/OemService.java

@@ -12,5 +12,5 @@ public interface OemService {
 
     int updateOem(OemBo oemBo);
 
-    int deleteOemById(int oemId);
+    int deleteOemById(Long[] oemId);
 }

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/OemSeviceImpl.java

@@ -15,6 +15,8 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+
 @RequiredArgsConstructor
 @Service
 public class OemSeviceImpl implements OemService {
@@ -47,8 +49,8 @@ public class OemSeviceImpl implements OemService {
         return oemMapper.updateById(oem);
     }
     @Override
-    public int deleteOemById(int oemId) {
-        return oemMapper.deleteById(oemId);
+    public int deleteOemById(Long[] oemIds) {
+        return oemMapper.deleteByIds(Arrays.asList(oemIds));
     }
     /**
      * 保存前检验