From 4999c2abcb7b28e209a65f60556b13d793adee0d Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Fri, 3 Jun 2022 17:21:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=A4=9A=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/controller/CategoryController.java | 12 ++----- .../iot/controller/DeviceController.java | 20 ++---------- .../iot/controller/FirmwareController.java | 4 +-- .../ruoyi/iot/controller/GroupController.java | 12 +------ .../iot/controller/ProductController.java | 9 +----- .../ThingsModelTemplateController.java | 13 +++----- .../com/ruoyi/iot/mapper/CategoryMapper.java | 2 -- .../com/ruoyi/iot/mapper/DeviceMapper.java | 1 - .../com/ruoyi/iot/mapper/GroupMapper.java | 2 -- .../com/ruoyi/iot/mapper/ProductMapper.java | 2 -- .../iot/mapper/ThingsModelTemplateMapper.java | 3 +- .../ruoyi/iot/service/ICategoryService.java | 3 -- .../com/ruoyi/iot/service/IDeviceService.java | 6 ---- .../com/ruoyi/iot/service/IGroupService.java | 3 -- .../ruoyi/iot/service/IProductService.java | 2 -- .../service/IThingsModelTemplateService.java | 2 -- .../iot/service/impl/CategoryServiceImpl.java | 11 ++++--- .../iot/service/impl/DeviceServiceImpl.java | 31 ++++++++++++++++--- .../iot/service/impl/FirmwareServiceImpl.java | 6 ++++ .../iot/service/impl/GroupServiceImpl.java | 15 ++++++--- .../iot/service/impl/ProductServiceImpl.java | 11 ++++--- .../impl/ThingsModelTemplateServiceImpl.java | 11 ++++--- .../resources/mapper/iot/CategoryMapper.xml | 12 +------ .../resources/mapper/iot/DeviceMapper.xml | 20 +----------- .../resources/mapper/iot/FirmwareMapper.xml | 3 +- .../main/resources/mapper/iot/GroupMapper.xml | 9 +----- .../resources/mapper/iot/ProductMapper.xml | 19 +----------- .../mapper/iot/ThingsModelTemplateMapper.xml | 11 +------ 28 files changed, 80 insertions(+), 175 deletions(-) diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java index fd657d59..fab144bd 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/CategoryController.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.iot.model.IdAndName; import io.swagger.annotations.Api; @@ -49,15 +51,7 @@ public class CategoryController extends BaseController public TableDataInfo list(Category category) { startPage(); - List list = new ArrayList<>(); - if(category.getTenantName()== null || category.getTenantName()=="") - { - list = categoryService.selectCategoryList(category); - }else { - list = categoryService.selectCategoryListAccurate(category); - } - - return getDataTable(list); + return getDataTable(categoryService.selectCategoryList(category)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java index 3c172939..b83ec4a8 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java @@ -44,15 +44,7 @@ public class DeviceController extends BaseController public TableDataInfo list(Device device) { startPage(); - List list = new ArrayList<>(); - if(device.getUserId() == null) - { - list = deviceService.selectDeviceList(device); - }else { - // 精确查询 - list = deviceService.selectDeviceListAccurate(device); - } - return getDataTable(list); + return getDataTable(deviceService.selectDeviceList(device)); } /** @@ -64,15 +56,7 @@ public class DeviceController extends BaseController public TableDataInfo shortList(Device device) { startPage(); - List list = new ArrayList<>(); - if(device.getUserId() == null) - { - list = deviceService.selectDeviceShortList(device); - }else { - // 精确查询 - list = deviceService.selectDeviceShortListAccurate(device); - } - return getDataTable(list); + return getDataTable(deviceService.selectDeviceShortList(device)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java index 82382719..d55e372b 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/FirmwareController.java @@ -59,9 +59,7 @@ public class FirmwareController extends BaseController public TableDataInfo list(Firmware firmware) { startPage(); - System.out.print("租户名称"+firmware.getTenantName()+"hs"); - List list = firmwareService.selectFirmwareList(firmware); - return getDataTable(list); + return getDataTable(firmwareService.selectFirmwareList(firmware)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java index 980de8e9..c75c4201 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java @@ -50,17 +50,7 @@ public class GroupController extends BaseController public TableDataInfo list(Group group) { startPage(); - List list = new ArrayList<>(); - if(group.getUserName() == null || group.getUserName().equals("")) - { -// 搜索查询 ,mapper使用的是模糊查询 - list = groupService.selectGroupList(group); - - }else { -// 精准查询 - list = groupService.selectGroupListAccurate(group); - } - return getDataTable(list); + return getDataTable(groupService.selectGroupList(group)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java index 88d0900c..678dfa60 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ProductController.java @@ -43,14 +43,7 @@ public class ProductController extends BaseController public TableDataInfo list(Product product) { startPage(); - List list = new ArrayList<>(); - if(product.getTenantName()=="" ||product.getTenantName()==null) - { - list = productService.selectProductList(product); - }else { - list = productService.selectProductListAccurate(product); - } - return getDataTable(list); + return getDataTable(productService.selectProductList(product)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java index 5022a76d..910fc0e4 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,6 +27,8 @@ import com.ruoyi.iot.service.IThingsModelTemplateService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import static com.ruoyi.common.utils.SecurityUtils.getLoginUser; + /** * 通用物模型Controller * @@ -48,14 +52,7 @@ public class ThingsModelTemplateController extends BaseController public TableDataInfo list(ThingsModelTemplate thingsModelTemplate) { startPage(); - List list = new ArrayList<>(); - if (thingsModelTemplate.getTenantName().equals("")|| thingsModelTemplate.getTenantName() == null){ - list = thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate); - }else{ -// 精准查询 - list = thingsModelTemplateService.selectThingsModelTemplateListAccurate(thingsModelTemplate); - } - return getDataTable(list); + return getDataTable(thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate)); } /** diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java index 5b357f88..36287aa1 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/CategoryMapper.java @@ -77,8 +77,6 @@ public interface CategoryMapper * @return 结果 */ public int productCountInCategorys(Long[] categoryIds); - // 精准查询 - List selectCategoryListAccurate(Category category); List selectCategoryShortListAccurate(Category category); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java index 2a9b7c45..bc99be99 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java @@ -180,5 +180,4 @@ public interface DeviceMapper */ List selectDeviceListAccurate(Device device); - List selectDeviceShortListAccurate(Device device); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java index 4f72fdad..59bc22b7 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/GroupMapper.java @@ -84,6 +84,4 @@ public interface GroupMapper */ public int deleteDeviceGroupByGroupIds(Long[] groupIds); -// 精准查询所有 - List selectGroupListAccurate(Group group); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java index dc9a5614..dae480a1 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ProductMapper.java @@ -116,6 +116,4 @@ public interface ProductMapper * @return 结果 */ public int thingsCountInProduct(Long productId); - // 精准查询 - List selectProductListAccurate(Product product); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java index 75478ac6..07572988 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/ThingsModelTemplateMapper.java @@ -68,6 +68,5 @@ public interface ThingsModelTemplateMapper * @return 结果 */ public int deleteThingsModelTemplateByTemplateIds(Long[] templateIds); - // 精准查询 - List selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate); + } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java index 8d610e00..27bf5eff 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/ICategoryService.java @@ -69,8 +69,5 @@ public interface ICategoryService */ public int deleteCategoryByCategoryId(Long categoryId); -// 精准查询 - List selectCategoryListAccurate(Category category); - List selectCategoryShortListAccurate(Category category); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java index d9552ff5..775df5db 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java @@ -172,10 +172,4 @@ public interface IDeviceService */ List selectDeviceListAccurate(Device device); - /** - * 精准查询所有条件设备的简短信息 - * @param device - * @return - */ - List selectDeviceShortListAccurate(Device device); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java index db9ce721..b403934e 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IGroupService.java @@ -73,7 +73,4 @@ public interface IGroupService * @return 结果 */ public int deleteGroupByGroupId(Long groupId); - -// 精准查询 - List selectGroupListAccurate(Group group); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java index f1d1753f..8c691e7b 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IProductService.java @@ -78,6 +78,4 @@ public interface IProductService */ public int deleteProductByProductId(Long productId); -// 精准查询 - List selectProductListAccurate(Product product); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java index 40307c45..41c98186 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IThingsModelTemplateService.java @@ -59,6 +59,4 @@ public interface IThingsModelTemplateService */ public int deleteThingsModelTemplateByTemplateId(Long templateId); -// 精准查询 - List selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java index 82cdaab7..76c13286 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java @@ -48,6 +48,12 @@ public class CategoryServiceImpl implements ICategoryService @Override public List selectCategoryList(Category category) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + // 租户 + if(roles.stream().anyMatch(a->a.getRoleKey().equals("tenant"))){ + category.setTenantId(user.getUserId()); + } return categoryMapper.selectCategoryList(category); } @@ -132,9 +138,4 @@ public class CategoryServiceImpl implements ICategoryService { return categoryMapper.deleteCategoryByCategoryId(categoryId); } - - @Override - public List selectCategoryListAccurate(Category category) { - return categoryMapper.selectCategoryListAccurate(category); - } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index 335cd5f7..6741af0d 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.iot.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; @@ -218,6 +219,17 @@ public class DeviceServiceImpl implements IDeviceService { */ @Override public List selectDeviceList(Device device) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + for(int i=0;i selectDeviceShortList(Device device) { // TODO 关联设备用户表 + + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + for(int i=0;i deviceList = deviceMapper.selectDeviceShortList(device); for (int i = 0; i < deviceList.size(); i++) { JSONObject thingsModelObject = JSONObject.parseObject(thingsModelService.getCacheThingsModelByProductId(deviceList.get(i).getProductId())); @@ -254,11 +280,6 @@ public class DeviceServiceImpl implements IDeviceService { return deviceList; } - // 精准查询所有条件的设备 - @Override - public List selectDeviceShortListAccurate(Device device) { - return deviceMapper.selectDeviceShortListAccurate(device); - } /** * Json物模型集合转换为对象中的分类集合 diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java index 9962fb34..35f57950 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java @@ -46,6 +46,12 @@ public class FirmwareServiceImpl implements IFirmwareService @Override public List selectFirmwareList(Firmware firmware) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + // 租户 + if(roles.stream().anyMatch(a->a.getRoleKey().equals("tenant"))){ + firmware.setTenantId(user.getUserId()); + } return firmwareMapper.selectFirmwareList(firmware); } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java index f63dac75..f0545867 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/GroupServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.iot.service.impl; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.iot.domain.Group; @@ -63,6 +64,15 @@ public class GroupServiceImpl implements IGroupService @Override public List selectGroupList(Group group) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + for(int i=0;i selectGroupListAccurate(Group group) { - return groupMapper.selectGroupListAccurate(group); - } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java index 596e70ec..59972f19 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java @@ -59,6 +59,12 @@ public class ProductServiceImpl implements IProductService @Override public List selectProductList(Product product) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + // 租户 + if(roles.stream().anyMatch(a->a.getRoleKey().equals("tenant"))){ + product.setTenantId(user.getUserId()); + } return productMapper.selectProductList(product); } @@ -194,9 +200,4 @@ public class ProductServiceImpl implements IProductService redisCache.deleteObject(tslPreKey+productId); return productMapper.deleteProductByProductId(productId); } - // 精准查询 - @Override - public List selectProductListAccurate(Product product) { - return productMapper.selectProductListAccurate(product); - } } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java index ce808bb7..c5997eeb 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java @@ -47,6 +47,12 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi @Override public List selectThingsModelTemplateList(ThingsModelTemplate thingsModelTemplate) { + SysUser user = getLoginUser().getUser(); + List roles=user.getRoles(); + // 租户 + if(roles.stream().anyMatch(a->a.getRoleKey().equals("tenant"))){ + thingsModelTemplate.setTenantId(user.getUserId()); + } return thingsModelTemplateMapper.selectThingsModelTemplateList(thingsModelTemplate); } @@ -108,9 +114,4 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi { return thingsModelTemplateMapper.deleteThingsModelTemplateByTemplateId(templateId); } - // 精准查询 - @Override - public List selectThingsModelTemplateListAccurate(ThingsModelTemplate thingsModelTemplate) { - return thingsModelTemplateMapper.selectThingsModelTemplateListAccurate(thingsModelTemplate); - } } diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml index d2d44dbb..a1856517 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/CategoryMapper.xml @@ -29,17 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and category_name like concat('%', #{categoryName}, '%') - and tenant_name like concat('%', #{tenantName}, '%') - and is_sys = #{isSys} - - order by order_num - - diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml index b250f71b..12f09b7b 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_name like concat('%', #{productName}, '%') and user_id = #{userId} and user_name like concat('%', #{userName}, '%') - and tenant_id = #{tenantId} + and (tenant_id = #{tenantId} or is_sys = 1) and tenant_name like concat('%', #{tenantName}, '%') and serial_number = #{serialNumber} and status = #{status} @@ -131,24 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - - diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml index 1f0e37ce..81acc264 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/GroupMapper.xml @@ -28,14 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and group_name like concat('%', #{groupName}, '%') and user_name like concat('%', #{userName}, '%') - - order by group_order - - diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml index cbbab247..b7756a6a 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ProductMapper.xml @@ -41,29 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_name like concat('%', #{productName}, '%') and category_id = #{categoryId} and category_name like concat('%', #{categoryName}, '%') - and tenant_id = #{tenantId} and tenant_name like concat('%', #{tenantName}, '%') - and is_sys = #{isSys} - and is_authorize = #{isAuthorize} - and status = #{status} - and device_type = #{deviceType} - and network_method = #{networkMethod} - - order by create_time desc - - diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml index 7b161703..b19444c6 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/iot/ThingsModelTemplateMapper.xml @@ -31,16 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and template_name like concat('%', #{templateName}, '%') and type = #{type} and specs = #{specs} - - order by create_time desc - -