修改bug

iot-dao/iot-data-model/src/main/java/cc/iotkit/model/system/SysDictData.java

@@ -73,5 +73,4 @@ public class SysDictData extends TenantModel implements Id<Long>,Serializable {
      * 创建时间
      */
     private Date createTime;
-
 }

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

@@ -9,8 +9,11 @@
  */
 package cc.iotkit.data.manager;
 
+import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.api.Paging;
 import cc.iotkit.data.ICommonData;
 import cc.iotkit.model.product.Product;
+import cc.iotkit.model.system.SysConfig;
 
 import java.util.List;
 
@@ -28,4 +31,8 @@ public interface IProductData extends ICommonData<Product, Long> {
     Product findByProductKey(String productKey);
 
     void delByProductKey(String productKey);
+
+    Paging<Product> findAllByConditions(PageRequest<Product> pageRequest);
+
+    Paging<Product> findByConditions(String uid, String subUid, String pk, String name, Integer pageNum, Integer pageSize);
 }

iot-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java

@@ -44,4 +44,5 @@ public interface ISysDictData extends ICommonData<SysDictData, Long> {
      */
     long countByDicType(String dictType);
 
+    List<SysDictData> findByDicTypeAndTenant(String tenantId, String dictType);
 }

iot-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java

@@ -118,4 +118,14 @@ public class ProductDataCache implements IProductData {
     public Product findOneByCondition(Product data) {
         return null;
     }
+
+    @Override
+    public Paging<Product> findAllByConditions(PageRequest<Product> pageRequest) {
+        return productData.findAllByConditions(pageRequest);
+    }
+
+    @Override
+    public Paging<Product> findByConditions(String uid, String subUid, String pk, String name, Integer pageNum, Integer pageSize) {
+        return productData.findByConditions(uid,subUid, pk, name,  pageNum, pageSize);
+    }
 }

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

@@ -1,12 +1,23 @@
 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.common.utils.StringUtils;
 import cc.iotkit.data.dao.IJPACommData;
 import cc.iotkit.data.dao.ProductRepository;
 import cc.iotkit.data.manager.IProductData;
+import cc.iotkit.data.model.TbDeviceInfo;
 import cc.iotkit.data.model.TbProduct;
+import cc.iotkit.data.model.TbSysConfig;
+import cc.iotkit.data.util.PageBuilder;
+import cc.iotkit.data.util.PredicateBuilder;
+import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.product.Product;
+import cc.iotkit.model.system.SysConfig;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.Predicate;
+import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
@@ -15,9 +26,13 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static cc.iotkit.data.model.QTbDeviceInfo.tbDeviceInfo;
+import static cc.iotkit.data.model.QTbDeviceSubUser.tbDeviceSubUser;
 import static cc.iotkit.data.model.QTbProduct.tbProduct;
+import static cc.iotkit.data.model.QTbSysConfig.tbSysConfig;
 
 @Primary
 @Service
@@ -79,4 +94,46 @@ public class ProductDataImpl implements IProductData, IJPACommData<Product, Long
         return data;
     }
 
+
+    @Override
+    public Paging<Product> findAllByConditions(PageRequest<Product> pageRequest) {
+        Product data = pageRequest.getData();
+        Predicate predicate = buildPredicate(data);
+        QueryResults<TbProduct> tbSysConfigQueryResults = jpaQueryFactory.select(tbProduct).from(tbProduct).where(predicate).limit(pageRequest.getPageSize()).offset(pageRequest.getOffset()).fetchResults();
+        return PageBuilder.queryResults2Page(tbSysConfigQueryResults, SysConfig.class);
+
+    }
+
+    private Predicate buildPredicate(Product data) {
+        return PredicateBuilder.instance()
+                .and(StringUtils.isNotEmpty(data.getProductKey()), () -> tbProduct.productKey.eq(data.getProductKey()))
+                .and(StringUtils.isNotEmpty(data.getName()), () -> tbProduct.name.like(data.getName()))
+//                .and(StringUtils.isNotEmpty(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
+                .build();
+    }
+
+    @Override
+    public Paging<Product> findByConditions(String uid, String subUid, String productKey, String name, Integer page, Integer size) {
+        JPAQuery<TbProduct> query = jpaQueryFactory.selectFrom(tbProduct);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(uid)) {
+            query.where(tbProduct.uid.eq(uid));
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(productKey)) {
+            query.where(tbProduct.productKey.eq(productKey));
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(name)) {
+            query.where(tbProduct.name.like("%" + name + "%"));
+        }
+        query.orderBy(tbDeviceInfo.createAt.desc());
+        query.offset((page - 1) * size).limit(size);
+
+        List<TbProduct> tbProducts = query.fetch();
+        long total = query.fetchCount();
+        List<Product> products = new ArrayList<>(tbProducts.size());
+        for (TbProduct tbProduct : tbProducts) {
+            Product product = MapstructUtils.convert(tbProduct, Product.class);
+            products.add(product);
+        }
+        return new Paging<>(total, products);
+    }
 }

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

@@ -137,6 +137,7 @@ public class SysConfigDataImpl implements ISysConfigData, IJPACommData<SysConfig
                 .and(StringUtils.isNotEmpty(data.getConfigKey()), () -> tbSysConfig.configKey.eq(data.getConfigKey()))
                 .and(StringUtils.isNotEmpty(data.getConfigName()), () -> tbSysConfig.configName.like(data.getConfigName()))
                 .and(StringUtils.isNotEmpty(data.getConfigType()), () -> tbSysConfig.configType.eq(data.getConfigType()))
+                .and(StringUtils.isNotEmpty(data.getTenantId()), () -> tbSysConfig.tenantId.eq(data.getTenantId()))
                 .build();
     }
 }

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

@@ -84,6 +84,18 @@ public class SysDictDataImpl implements ISysDictData, IJPACommData<SysDictData,
         return MapstructUtils.convert(rets,SysDictData.class);
     }
 
+    @Override
+    public List<SysDictData> findByDicTypeAndTenant(String tenantId, String dictType) {
+        List<TbSysDictData> rets=jpaQueryFactory.select(tbSysDictData).from(tbSysDictData)
+                .where(PredicateBuilder.instance()
+                        .and(tbSysDictData.status.eq(UserConstants.DICT_NORMAL))
+                        .and(tbSysDictData.dictType.eq(dictType))
+                        .and(StringUtils.isNotBlank(tenantId),()->tbSysDictData.tenantId.eq(tenantId))
+                        .build()).orderBy(tbSysDictData.dictSort.asc())
+                .fetch();
+        return MapstructUtils.convert(rets,SysDictData.class);
+    }
+
     @Override
     public long countByDicType(String dictType) {
         return 0;

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

@@ -69,6 +69,8 @@ public class SysNoticeDataImpl implements ISysNoticeData, IJPACommData<SysNotice
                         tbSysNotice.status.eq(query.getStatus()))
                 .and(StringUtils.isNotBlank(query.getCreateByName()), ()->(
                         tbSysNotice.createBy.like(query.getCreateByName())))
+                .and(StringUtils.isNotBlank(query.getTenantId()), ()->(
+                        tbSysNotice.tenantId.like(query.getTenantId())))
         .build();
     }
 }

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

@@ -105,6 +105,7 @@ public class SysPostDataImpl implements ISysPostData, IJPACommData<SysPost, Long
         return PredicateBuilder.instance()
                 .and(StringUtils.isNotBlank(post.getPostCode()), () -> tbSysPost.postCode.like(post.getPostCode()))
                 .and(StringUtils.isNotBlank(post.getPostName()), () -> tbSysPost.postName.like(post.getPostName()))
+                .and(StringUtils.isNotBlank(post.getTenantId()), () -> tbSysPost.tenantId.eq(post.getTenantId()))
                 .and(StringUtils.isNotBlank(post.getStatus()), () -> tbSysPost.status.eq(post.getStatus())).build();
     }
 }

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

@@ -53,7 +53,8 @@ public class ProductController {
     @PostMapping("/list")
     public Paging<ProductVo> getProducts(@Validated @RequestBody
                                          PageRequest<ProductBo> request) {
-        return productService.selectPageList(request);
+//        return productService.selectPageList(request);
+        return productService.getProducts(request);
     }
 
     @ApiOperation("新建")

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/product/ProductBo.java

@@ -59,4 +59,6 @@ public class ProductBo extends BaseDto {
     @Size(max = 255, message = "产品密钥长度不正确")
     private String productSecret;
 
+
+
 }

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

@@ -10,6 +10,7 @@ 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.model.product.Product;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -56,4 +57,6 @@ public interface IProductService {
     ProductVo findByProductKey(String productKey);
 
     List<ProductVo> selectProductList();
+
+    Paging<ProductVo> getProducts(PageRequest<ProductBo> request);
 }

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

@@ -9,6 +9,7 @@ import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.*;
 import cc.iotkit.manager.config.AliyunConfig;
 import cc.iotkit.manager.dto.bo.category.CategoryBo;
+import cc.iotkit.manager.dto.bo.device.DeviceQueryBo;
 import cc.iotkit.manager.dto.bo.product.ProductBo;
 import cc.iotkit.manager.dto.bo.productmodel.ProductModelBo;
 import cc.iotkit.manager.dto.bo.thingmodel.ThingModelBo;
@@ -22,6 +23,7 @@ import cc.iotkit.model.product.Category;
 import cc.iotkit.model.product.Product;
 import cc.iotkit.model.product.ProductModel;
 import cc.iotkit.model.product.ThingModel;
+import cc.iotkit.model.system.SysConfig;
 import cc.iotkit.temporal.IDbStructureData;
 import cn.hutool.core.lang.UUID;
 import com.github.yitter.idgen.YitIdHelper;
@@ -192,7 +194,8 @@ public class ProductServiceImpl implements IProductService {
 
     @Override
     public Paging<ProductVo> selectPageList(PageRequest<ProductBo> request) {
-        return productData.findAll(request.to(Product.class)).to(ProductVo.class);
+        return productData.findAllByConditions(request.to(Product.class)).to(ProductVo.class);
+//        return productData.findAll(request.to(Product.class)).to(ProductVo.class);
     }
 
     @Override
@@ -259,4 +262,23 @@ public class ProductServiceImpl implements IProductService {
     public List<ProductVo> selectProductList() {
         return MapstructUtils.convert(productData.findAll(), ProductVo.class);
     }
+
+    @Override
+    public Paging<ProductVo> getProducts(PageRequest<ProductBo> pageRequest) {
+        ProductBo query = pageRequest.getData();
+
+        String uid = "";
+        String subUid = "";
+//        if (!AuthUtil.isAdmin()) {
+//            //客户端用户使用绑定子用户查询
+//            if (AuthUtil.isClientUser()) {
+//                subUid = AuthUtil.getUserId();
+//            } else {
+//                uid = AuthUtil.getUserId();
+//            }
+//        }
+        String pk = query.getProductKey();
+        String name = query.getName();
+        return productData.findByConditions(uid, subUid, pk, name, pageRequest.getPageNum(), pageRequest.getPageSize()).to(ProductVo.class);
+    }
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysConfigController.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
 import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
@@ -44,6 +45,7 @@ public class SysConfigController extends BaseController {
   @SaCheckPermission("system:config:list")
   @PostMapping("/list")
   public Paging<SysConfigVo> list(@RequestBody @Validated(QueryGroup.class) PageRequest<SysConfigBo> query) {
+    query.getData().setTenantId(TenantHelper.getTenantId());
     return configService.selectPageConfigList(query);
   }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java

@@ -6,6 +6,8 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
+import cc.iotkit.model.system.SysDictData;
 import cc.iotkit.system.dto.bo.SysDictDataBo;
 import cc.iotkit.system.dto.vo.SysDictDataVo;
 import cc.iotkit.system.service.ISysDictDataService;
@@ -42,6 +44,7 @@ public class SysDictDataController {
     @ApiOperation(value = "查询字典数据列表", notes = "查询字典数据列表")
     @PostMapping("/list")
     public Paging<SysDictDataVo> list(@Validated @RequestBody  PageRequest<SysDictDataBo> query) {
+        query.getData().setTenantId(TenantHelper.getTenantId());
         return dictDataService.selectPageDictDataList( query);
     }
 
@@ -78,7 +81,7 @@ public class SysDictDataController {
     @PostMapping(value = "/type")
     public List<SysDictDataVo> dictType(@Validated @RequestBody Request<String> bo) {
         String dictType = bo.getData();
-        List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
+        List<SysDictDataVo> data = dictTypeService.selectDictDataByTypeAndTenant(TenantHelper.getTenantId(),dictType);
         if (ObjectUtil.isNull(data)) {
             data = new ArrayList<>();
         }

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
 import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
@@ -44,6 +45,7 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:list")
     @PostMapping("/list")
     public Paging<SysDictTypeVo> list(@RequestBody @Validated(QueryGroup.class) PageRequest<SysDictTypeBo> query) {
+        query.getData().setTenantId(TenantHelper.getTenantId());
         return dictTypeService.selectPageDictTypeList(query);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysNoticeController.java

@@ -5,6 +5,7 @@ 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.tenant.helper.TenantHelper;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.system.dto.bo.SysNoticeBo;
 import cc.iotkit.system.dto.vo.SysNoticeVo;
@@ -40,6 +41,7 @@ public class SysNoticeController extends BaseController {
     @ApiOperation(value = "获取通知公告列表", notes = "获取通知公告列表")
     @PostMapping("/list")
     public Paging<SysNoticeVo> list(@Validated @RequestBody PageRequest<SysNoticeBo> query) {
+        query.getData().setTenantId(TenantHelper.getTenantId());
         return noticeService.selectPageNoticeList( query);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysPostController.java

@@ -6,6 +6,7 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.tenant.helper.TenantHelper;
 import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
@@ -46,6 +47,7 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:list")
     @PostMapping("/list")
     public Paging<SysPostVo> list(@RequestBody @Validated(QueryGroup.class) PageRequest<SysPostBo> query) {
+        query.getData().setTenantId(TenantHelper.getTenantId());
         return postService.selectPagePostList(query);
     }
 

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysConfigBo.java

@@ -59,5 +59,11 @@ public class SysConfigBo extends BaseDto {
      */
     private String remark;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+
 
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictDataBo.java

@@ -85,4 +85,9 @@ public class SysDictDataBo extends BaseDto {
      */
     private String remark;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysDictTypeBo.java

@@ -54,5 +54,11 @@ public class SysDictTypeBo extends BaseDto {
      */
     private String remark;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+
 
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysNoticeBo.java

@@ -60,4 +60,9 @@ public class SysNoticeBo extends BaseDto {
      */
     private String createByName;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysOssConfigBo.java

@@ -106,4 +106,6 @@ public class SysOssConfigBo extends BaseDto {
     @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class})
     private String accessPolicy;
 
+
+
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/dto/bo/SysPostBo.java

@@ -58,5 +58,10 @@ public class SysPostBo extends BaseDto {
      */
     private String remark;
 
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
 
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/service/ISysDictTypeService.java

@@ -2,6 +2,8 @@ package cc.iotkit.system.service;
 
 import cc.iotkit.common.api.PageRequest;
 import cc.iotkit.common.api.Paging;
+import cc.iotkit.model.system.SysDictData;
+import cc.iotkit.system.dto.bo.SysDictDataBo;
 import cc.iotkit.system.dto.bo.SysDictTypeBo;
 import cc.iotkit.system.dto.vo.SysDictDataVo;
 import cc.iotkit.system.dto.vo.SysDictTypeVo;
@@ -93,4 +95,6 @@ public interface ISysDictTypeService {
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictTypeBo dictType);
+
+    List<SysDictDataVo> selectDictDataByTypeAndTenant(String tenantId, String dictType);
 }

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysDictTypeServiceImpl.java

@@ -14,6 +14,7 @@ import cc.iotkit.data.system.ISysDictData;
 import cc.iotkit.data.system.ISysDictTypeData;
 import cc.iotkit.model.system.SysDictData;
 import cc.iotkit.model.system.SysDictType;
+import cc.iotkit.system.dto.bo.SysDictDataBo;
 import cc.iotkit.system.dto.bo.SysDictTypeBo;
 import cc.iotkit.system.dto.vo.SysDictDataVo;
 import cc.iotkit.system.dto.vo.SysDictTypeVo;
@@ -79,6 +80,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
         return MapstructUtils.convert(sysDictData.findByDicType(dictType), SysDictDataVo.class);
     }
 
+    @Override
+    public List<SysDictDataVo> selectDictDataByTypeAndTenant(String tenantId, String dictType) {
+        return MapstructUtils.convert(sysDictData.findByDicTypeAndTenant(tenantId,dictType), SysDictDataVo.class);
+    }
+
     /**
      * 根据字典类型ID查询信息
      *
@@ -226,5 +232,4 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
             return map.getOrDefault(dictLabel, StringUtils.EMPTY);
         }
     }
-
 }