仓储依赖包

hx-common/library-product/src/main/java/com/fjhx/controller/ClassifyController.java

@@ -1,6 +1,6 @@
 package com.fjhx.controller;
 
-import com.fjhx.params.ClassifyVo;
+import com.fjhx.entity.Classify;
 import com.fjhx.service.ClassifyService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,20 +34,20 @@ public class ClassifyController {
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody ClassifyVo classifyVo) {
-        classifyService.add(classifyVo);
+    public R add(@RequestBody Classify classify) {
+        classifyService.add(classify);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody ClassifyVo classifyVo) {
-        classifyService.edit(classifyVo);
+    public R edit(@RequestBody Classify classify) {
+        classifyService.edit(classify);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody ClassifyVo classifyVo) {
-        classifyService.delete(classifyVo);
+    public R delete(@RequestBody Classify classify) {
+        classifyService.delete(classify);
         return R.success();
     }
 

hx-common/library-product/src/main/java/com/fjhx/params/ClassifyVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params;
-
-import com.fjhx.entity.Classify;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 分类
- *
- * @author ${author}
- * @since 2022-07-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ClassifyVo extends Classify {
-
-}

hx-common/library-product/src/main/java/com/fjhx/params/MaterialVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params;
-
-import com.fjhx.entity.Material;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 物料
- *
- * @author ${author}
- * @since 2022-07-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MaterialVo extends Material {
-
-}

hx-common/library-product/src/main/java/com/fjhx/params/ProductVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params;
-
-import com.fjhx.entity.Product;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 产品
- *
- * @author ${author}
- * @since 2022-07-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProductVo extends Product {
-
-}

hx-common/library-product/src/main/java/com/fjhx/service/ClassifyService.java

@@ -1,8 +1,7 @@
 package com.fjhx.service;
 
-import com.fjhx.entity.Classify;
-import com.fjhx.params.ClassifyVo;
 import com.fjhx.base.BaseService;
+import com.fjhx.entity.Classify;
 
 import java.util.List;
 import java.util.Map;
@@ -19,11 +18,11 @@ public interface ClassifyService extends BaseService<Classify> {
 
     List<Map<String, Object>> getTree(Map<String, String> condition);
 
-    void add(ClassifyVo classifyVo);
+    void add(Classify classify);
 
-    void edit(ClassifyVo classifyVo);
+    void edit(Classify classify);
 
-    void delete(ClassifyVo classifyVo);
+    void delete(Classify classify);
 
     /**
      * 获取 分类id 和 分类子级id 数组

hx-common/library-product/src/main/java/com/fjhx/service/MaterialService.java

@@ -2,7 +2,6 @@ package com.fjhx.service;
 
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.Material;
-import com.fjhx.params.MaterialVo;
 
 import java.util.List;
 
@@ -16,13 +15,11 @@ import java.util.List;
  */
 public interface MaterialService extends BaseService<Material> {
 
-//    Page<Material> getPage(Map<String, String> condition);
+    void add(Material material);
 
-    void add(MaterialVo materialVo);
+    void edit(Material material);
 
-    void edit(MaterialVo materialVo);
-
-    void delete(MaterialVo materialVo);
+    void delete(Material material);
 
     /**
      * 获取租户添加过的物料单位集合

hx-common/library-product/src/main/java/com/fjhx/service/ProductService.java

@@ -1,12 +1,9 @@
 package com.fjhx.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.Product;
-import com.fjhx.params.ProductVo;
 import com.fjhx.base.BaseService;
+import com.fjhx.entity.Product;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,13 +15,11 @@ import java.util.Map;
  */
 public interface ProductService extends BaseService<Product> {
 
-//    Page<Product> getPage(Map<String, String> condition);
-
-    void add(ProductVo productVo);
+    void add(Product product);
 
-    void edit(ProductVo productVo);
+    void edit(Product product);
 
-    void delete(ProductVo productVo);
+    void delete(Product product);
 
     /**
      * 获取租户添加过的产品单位集合

hx-common/library-product/src/main/java/com/fjhx/service/impl/ClassifyServiceImpl.java

@@ -8,7 +8,6 @@ import com.fjhx.entity.Material;
 import com.fjhx.entity.Product;
 import com.fjhx.enums.ClassifyTypeEnum;
 import com.fjhx.mapper.ClassifyMapper;
-import com.fjhx.params.ClassifyVo;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.MaterialService;
 import com.fjhx.service.ProductService;
@@ -59,17 +58,17 @@ public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> i
     }
 
     @Override
-    public void add(ClassifyVo classifyVo) {
+    public void add(Classify classify) {
 
-        Assert.notEmpty(classifyVo.getType(), "分类类型不能为空");
-        Assert.notEmpty(classifyVo.getName(), "分类名称不能为空");
+        Assert.notEmpty(classify.getType(), "分类类型不能为空");
+        Assert.notEmpty(classify.getName(), "分类名称不能为空");
 
-        Long parentId = classifyVo.getParentId();
+        Long parentId = classify.getParentId();
         if (parentId == null) {
-            classifyVo.setParentId(0L);
-            classifyVo.setParentIdSet(null);
+            classify.setParentId(0L);
+            classify.setParentIdSet(null);
         } else if (parentId == 0L) {
-            classifyVo.setParentIdSet(null);
+            classify.setParentIdSet(null);
         } else {
             // 查询父级分类
             Classify parentClassify = getById(parentId);
@@ -77,28 +76,28 @@ public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> i
 
             // 赋值父级id集合
             String parentIdSet = parentClassify.getParentIdSet();
-            classifyVo.setParentIdSet(
+            classify.setParentIdSet(
                     (ObjectUtil.isEmpty(parentIdSet) ? "" : parentIdSet + ",") + parentId);
         }
 
-        peerNameOnly(classifyVo.getParentId(), classifyVo.getName(), null);
-        save(classifyVo);
+        peerNameOnly(classify.getParentId(), classify.getName(), null);
+        save(classify);
     }
 
     @Override
-    public void edit(ClassifyVo classifyVo) {
-        Assert.notEmpty(classifyVo.getId(), "分类Id不能为空");
-        Assert.notEmpty(classifyVo.getParentId(), "父分类id不能为空");
-        Assert.notEmpty(classifyVo.getName(), "分类名称不能为空");
+    public void edit(Classify classify) {
+        Assert.notEmpty(classify.getId(), "分类Id不能为空");
+        Assert.notEmpty(classify.getParentId(), "父分类id不能为空");
+        Assert.notEmpty(classify.getName(), "分类名称不能为空");
 
-        peerNameOnly(classifyVo.getParentId(), classifyVo.getName(), classifyVo.getId());
-        updateById(classifyVo);
+        peerNameOnly(classify.getParentId(), classify.getName(), classify.getId());
+        updateById(classify);
     }
 
     @Override
-    public void delete(ClassifyVo classifyVo) {
-        Long id = classifyVo.getId();
-        Integer type = classifyVo.getType();
+    public void delete(Classify classify) {
+        Long id = classify.getId();
+        Integer type = classify.getType();
 
         Assert.notEmpty(id, "分类id不能为空");
         Assert.notEmpty(type, "分类类型不能为空");
@@ -114,7 +113,7 @@ public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> i
             Assert.eqZero(relationCount, "该分类下存在物料，无法删除");
         }
 
-        removeById(classifyVo.getId());
+        removeById(classify.getId());
     }
 
     @Override

hx-common/library-product/src/main/java/com/fjhx/service/impl/MaterialServiceImpl.java

@@ -7,7 +7,6 @@ import com.fjhx.constant.ProductLibraryLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Material;
 import com.fjhx.mapper.MaterialMapper;
-import com.fjhx.params.MaterialVo;
 import com.fjhx.service.MaterialService;
 import com.fjhx.utils.Assert;
 import lombok.RequiredArgsConstructor;
@@ -32,9 +31,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     private final RedisLockClient redisLockClient;
 
     @Override
-    public void add(MaterialVo materialVo) {
-        Assert.notEmpty(materialVo.getName(), "物料名称不能为空");
-        Assert.notEmpty(materialVo.getCode(), "物料编码不能为空");
+    public void add(Material material) {
+        Assert.notEmpty(material.getName(), "物料名称不能为空");
+        Assert.notEmpty(material.getCode(), "物料编码不能为空");
 
 
         String tenantId = AuthUtil.getTenantId();
@@ -43,8 +42,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
                     // 判断物料编码不是唯一的
-                    materialCodeOnly(tenantId, materialVo.getCode(), null);
-                    save(materialVo);
+                    materialCodeOnly(tenantId, material.getCode(), null);
+                    save(material);
                     return true;
                 });
 
@@ -52,15 +51,15 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     }
 
     @Override
-    public void edit(MaterialVo materialVo) {
+    public void edit(Material material) {
         String tenantId = AuthUtil.getTenantId();
 
         // 保证每个租户物料编码唯一
         Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.MATERIAL_CODE_ONLY_LOCK + tenantId,
                 () -> {
                     // 判断物料编码不是唯一的
-                    materialCodeOnly(tenantId, materialVo.getCode(), materialVo.getId());
-                    updateById(materialVo);
+                    materialCodeOnly(tenantId, material.getCode(), material.getId());
+                    updateById(material);
                     return true;
                 });
 
@@ -68,8 +67,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
     }
 
     @Override
-    public void delete(MaterialVo materialVo) {
-        removeById(materialVo.getId());
+    public void delete(Material material) {
+        removeById(material.getId());
     }
 
     @Override

hx-common/library-product/src/main/java/com/fjhx/service/impl/ProductServiceImpl.java

@@ -7,7 +7,6 @@ import com.fjhx.constant.ProductLibraryLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.entity.Product;
 import com.fjhx.mapper.ProductMapper;
-import com.fjhx.params.ProductVo;
 import com.fjhx.service.ProductService;
 import com.fjhx.utils.Assert;
 import lombok.RequiredArgsConstructor;
@@ -32,34 +31,34 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
     private final RedisLockClient redisLockClient;
 
     @Override
-    public void add(ProductVo productVo) {
-        Assert.notEmpty(productVo.getName(), "产品名称不能为空");
-        Assert.notEmpty(productVo.getCode(), "产品编码不能为空");
+    public void add(Product product) {
+        Assert.notEmpty(product.getName(), "产品名称不能为空");
+        Assert.notEmpty(product.getCode(), "产品编码不能为空");
 
         String tenantId = AuthUtil.getTenantId();
         Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
-            productCodeOnly(tenantId, productVo.getCode(), null);
-            save(productVo);
+            productCodeOnly(tenantId, product.getCode(), null);
+            save(product);
             return true;
         });
         Assert.eqTrue(flag, ErrorMsgConstant.SYSTEM_BUSY_ERROR);
     }
 
     @Override
-    public void edit(ProductVo productVo) {
-        Assert.notEmpty(productVo.getId(), "产品id不能为空");
+    public void edit(Product product) {
+        Assert.notEmpty(product.getId(), "产品id不能为空");
         String tenantId = AuthUtil.getTenantId();
         Boolean flag = redisLockClient.lockFair(ProductLibraryLockConstant.PRODUCT_CODE_ONLY_LOCK + tenantId, () -> {
-            productCodeOnly(tenantId, productVo.getCode(), productVo.getId());
-            updateById(productVo);
+            productCodeOnly(tenantId, product.getCode(), product.getId());
+            updateById(product);
             return true;
         });
         Assert.eqTrue(flag, ErrorMsgConstant.SYSTEM_BUSY_ERROR);
     }
 
     @Override
-    public void delete(ProductVo productVo) {
-        removeById(productVo.getId());
+    public void delete(Product product) {
+        removeById(product.getId());
     }
 
     @Override

hx-common/library-storage/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>hx-common</artifactId>
+        <groupId>com.fjhx</groupId>
+        <version>3.2.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>library-storage</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <!-- 工具模块 -->
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>common-tool</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

hx-common/pom.xml

@@ -22,6 +22,7 @@
         <module>common-tool</module>
         <module>service-video</module>
         <module>library-product</module>
+        <module>library-storage</module>
     </modules>
 
     <properties>

hx-service/iot-management/src/main/java/com/fjhx/service/material/impl/MaterialExServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.StatusConstant;
+import com.fjhx.entity.Material;
 import com.fjhx.entity.material.MaterialEx;
 import com.fjhx.mapper.material.MaterialExMapper;
-import com.fjhx.params.MaterialVo;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.MaterialService;
 import com.fjhx.service.material.MaterialExService;
@@ -63,7 +63,7 @@ public class MaterialExServiceImpl extends ServiceImpl<MaterialExMapper, Materia
     @Override
     public void add(Map<String, Object> map) {
 
-        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+        Material material = BeanUtil.toBean(map, Material.class);
         MaterialEx materialEx = BeanUtil.toBean(map, MaterialEx.class);
 
         Integer coiled = materialEx.getCoiled();
@@ -94,7 +94,7 @@ public class MaterialExServiceImpl extends ServiceImpl<MaterialExMapper, Materia
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(Map<String, Object> map) {
-        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+        Material material = BeanUtil.toBean(map, Material.class);
         MaterialEx materialEx = BeanUtil.toBean(map, MaterialEx.class);
 
         materialService.edit(material);
@@ -103,7 +103,7 @@ public class MaterialExServiceImpl extends ServiceImpl<MaterialExMapper, Materia
 
     @Override
     public void delete(Map<String, Object> map) {
-        MaterialVo material = BeanUtil.toBean(map, MaterialVo.class);
+        Material material = BeanUtil.toBean(map, Material.class);
 
         materialService.delete(material);
     }

hx-service/iot-management/src/main/java/com/fjhx/service/product/impl/ProductExServiceImpl.java

@@ -5,12 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.Product;
 import com.fjhx.entity.product.ProductEx;
-import com.fjhx.params.ProductVo;
 import com.fjhx.mapper.product.ProductExMapper;
-import com.fjhx.service.product.ProductExService;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.ProductService;
+import com.fjhx.service.product.ProductExService;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,7 +59,7 @@ public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx
 
     @Override
     public void add(Map<String, Object> map) {
-        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+        Product productVo = BeanUtil.toBean(map, Product.class);
         ProductEx productEx = BeanUtil.toBean(map, ProductEx.class);
 
         productService.add(productVo);
@@ -70,7 +70,7 @@ public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx
 
     @Override
     public void edit(Map<String, Object> map) {
-        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+        Product productVo = BeanUtil.toBean(map, Product.class);
         ProductEx productEx = BeanUtil.toBean(map, ProductEx.class);
 
         productService.edit(productVo);
@@ -79,7 +79,7 @@ public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx
 
     @Override
     public void delete(Map<String, Object> map) {
-        ProductVo productVo = BeanUtil.toBean(map, ProductVo.class);
+        Product productVo = BeanUtil.toBean(map, Product.class);
 
         productService.delete(productVo);
     }