fix:产品品类管理

iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java

@@ -24,4 +24,6 @@ public interface IProductData extends IOwnedData<Product, String> {
      */
     List<Product> findByCategory(String category);
 
+
+
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductDataImpl.java

@@ -1,12 +1,11 @@
 package cc.iotkit.data.service;
 
-import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.dao.IJPACommData;
-import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.dao.ProductRepository;
+import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.model.TbProduct;
-import cc.iotkit.common.api.Paging;
 import cc.iotkit.model.product.Product;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -15,7 +14,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
 
 @Primary
@@ -37,7 +35,7 @@ public class ProductDataImpl implements IProductData, IJPACommData<Product, Stri
 
     @Override
     public Class getTClass() {
-        return null;
+        return Product.class;
     }
 
     @Override

iot-module/iot-manager/src/main/java/cc/iotkit/manager/controller/ProductController.java

@@ -10,19 +10,20 @@
 package cc.iotkit.manager.controller;
 
 import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.api.Request;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
 import cc.iotkit.common.validate.AddGroup;
+import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.manager.dto.bo.category.CategoryBo;
 import cc.iotkit.manager.dto.bo.product.ProductBo;
 import cc.iotkit.manager.dto.bo.productmodel.ProductModelBo;
 import cc.iotkit.manager.dto.bo.thingmodel.ThingModelBo;
-import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import cc.iotkit.manager.dto.vo.category.CategoryVo;
 import cc.iotkit.manager.dto.vo.product.ProductVo;
 import cc.iotkit.manager.dto.vo.productmodel.ProductModelVo;
-import cc.iotkit.common.api.Paging;
+import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import cc.iotkit.manager.service.IProductService;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import io.swagger.annotations.Api;
@@ -66,8 +67,8 @@ public class ProductController {
     @ApiOperation(value = "编辑产品")
     @PostMapping("/edit")
     @Log(title = "产品", businessType = BusinessType.UPDATE)
-    public boolean edit(@RequestBody @Validated ProductBo productBo) {
-        return productService.updateEntity(productBo);
+    public boolean edit(@Validated(EditGroup.class) @RequestBody Request<ProductBo> request) {
+        return productService.updateEntity(request.getData());
     }
 
 
@@ -103,11 +104,17 @@ public class ProductController {
 
 
     @PostMapping("/category/list")
-    @ApiOperation("产品品类展示")
+    @ApiOperation("产品品类分页展示")
     public Paging<CategoryVo> getCategories(@Validated @RequestBody PageRequest<CategoryBo> request) {
         return productService.selectCategoryPageList(request);
     }
 
+    @PostMapping("/category/getList")
+    @ApiOperation("产品品类展示")
+    public List<CategoryVo> getCategorieList() {
+        return productService.selectCategoryList();
+    }
+
     @SaCheckRole("iot_admin")
     @ApiOperation("品类编辑")
     @PostMapping("/category/edit")
@@ -124,6 +131,7 @@ public class ProductController {
 
     }
 
+    @ApiOperation("上传产品图片")
     @PostMapping("/uploadImg/{productKey}")
     public String uploadImg(@PathVariable("productKey") String productKey,
                             @RequestParam("file") MultipartFile file) {

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/IProductService.java

@@ -6,10 +6,10 @@ import cc.iotkit.manager.dto.bo.category.CategoryBo;
 import cc.iotkit.manager.dto.bo.product.ProductBo;
 import cc.iotkit.manager.dto.bo.productmodel.ProductModelBo;
 import cc.iotkit.manager.dto.bo.thingmodel.ThingModelBo;
-import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
-import cc.iotkit.manager.dto.vo.product.ProductVo;
 import cc.iotkit.manager.dto.vo.category.CategoryVo;
+import cc.iotkit.manager.dto.vo.product.ProductVo;
 import cc.iotkit.manager.dto.vo.productmodel.ProductModelVo;
+import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -45,6 +45,8 @@ public interface IProductService {
 
     Paging<CategoryVo> selectCategoryPageList(PageRequest<CategoryBo> request);
 
+    List<CategoryVo> selectCategoryList();
+
     List<ProductModelVo> getModels(String productKey);
 
     boolean editProductModel(ProductModelBo productModel);

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/ProductServiceImpl.java

@@ -4,7 +4,6 @@ import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.satoken.utils.AuthUtil;
 import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ICategoryData;
@@ -16,10 +15,10 @@ import cc.iotkit.manager.dto.bo.category.CategoryBo;
 import cc.iotkit.manager.dto.bo.product.ProductBo;
 import cc.iotkit.manager.dto.bo.productmodel.ProductModelBo;
 import cc.iotkit.manager.dto.bo.thingmodel.ThingModelBo;
-import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import cc.iotkit.manager.dto.vo.category.CategoryVo;
 import cc.iotkit.manager.dto.vo.product.ProductVo;
 import cc.iotkit.manager.dto.vo.productmodel.ProductModelVo;
+import cc.iotkit.manager.dto.vo.thingmodel.ThingModelVo;
 import cc.iotkit.manager.service.DataOwnerService;
 import cc.iotkit.manager.service.IProductService;
 import cc.iotkit.model.product.Category;
@@ -182,9 +181,9 @@ public class ProductServiceImpl implements IProductService {
 
     @Override
     public Paging<ProductVo> selectPageList(PageRequest<ProductBo> request) {
-        if (!AuthUtil.isAdmin()) {
-            return productData.findByUid(AuthUtil.getUserId(), request.getPageNum(), request.getPageSize()).to(ProductVo.class);
-        }
+//        if (!AuthUtil.isAdmin()) {
+//            return productData.findByUid(AuthUtil.getUserId(), request.getPageNum(), request.getPageSize()).to(ProductVo.class);
+//        }
 
         return productData.findAll(request.to(Product.class)).to(ProductVo.class);
     }
@@ -195,6 +194,12 @@ public class ProductServiceImpl implements IProductService {
 
     }
 
+    @Override
+    public List<CategoryVo> selectCategoryList() {
+        return MapstructUtils.convert(categoryData.findAll(), CategoryVo.class);
+
+    }
+
     @Override
     public List<ProductModelVo> getModels(String productKey) {
         dataOwnerService.checkOwner(productData, productKey);