fix：小程序设备列表数据权限

9ce8647f · huangjy · 6d28a7fb · 9ce8647f · 9ce8647f · 9ce8647f
Commit 9ce8647f authored Oct 28, 2023 by huangjy
Showing with 32 additions and 0 deletions
server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceQueryDTO.java
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/resources/mappers/PlatDeviceMapper.xml
--- a/server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/wechat/device/PlatDeviceWechatController.java
 package com.makeit.module.controller.wechat.device;
+import com.google.common.collect.Lists;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
@@ -10,9 +11,14 @@ import com.makeit.dto.platform.device.PlatDeviceQueryDTO;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceEditWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
+import com.makeit.entity.platform.auth.PlatRole;
+import com.makeit.enums.HeaderConst;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.module.iot.vo.DeviceProperties;
+import com.makeit.service.platform.auth.PlatRoleService;
 import com.makeit.service.platform.device.PlatDeviceService;
+import com.makeit.utils.old.StringUtils;
+import com.makeit.utils.request.RequestUtil;
 import com.makeit.vo.platform.device.PlatDeviceListVO;
 import com.makeit.vo.platform.device.PlatDeviceViewVO;
 import io.swagger.annotations.Api;
@@ -41,10 +47,21 @@ public class PlatDeviceWechatController {
    @Autowired
    private PlatDeviceService platDeviceService;
+    @Autowired
+    private PlatRoleService platRoleService;
    @ApiOperation("分页列表")
    @PostMapping("page")
    public ApiResponseEntity<PageVO<PlatDeviceListVO>> page(@RequestBody PageReqDTO<PlatDeviceQueryDTO> pageReqDTO) {
+        PlatDeviceQueryDTO dto = pageReqDTO.getData();
+        String roleId = RequestUtil.getHeader(HeaderConst.ROLE_ID);
+        if (StringUtils.isNotEmpty(roleId)) {
+            PlatRole platRole = platRoleService.getById(roleId);
+            String dataScope = platRole.getDataScope();
+            if (StringUtils.isNotEmpty(dataScope)) {
+                dto.setOrgIds(Lists.newArrayList(dataScope.split(",")));
+            }
+        }
        return ApiResponseUtils.success(platDeviceService.page(pageReqDTO));
    }

--- a/server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceQueryDTO.java
+++ b/server-service/src/main/java/com/makeit/dto/platform/device/PlatDeviceQueryDTO.java
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.util.List;
 /**
 * <p>
 * 设备
@@ -37,6 +39,8 @@ public class PlatDeviceQueryDTO extends BaseTenantDTO {
    @ApiModelProperty(value = "组织id")
    private String orgId;
+    @ApiModelProperty(value = "数据权限")
+    private List<String> orgIds;
    private String spaceId;

--- a/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
@@ -22,6 +22,7 @@ import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceEditWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceSetupDTO;
 import com.makeit.entity.platform.auth.PlatOrg;
+import com.makeit.entity.platform.auth.PlatRole;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.device.PlatDeviceOther;
 import com.makeit.entity.platform.space.PlatRegionSetting;
@@ -30,6 +31,7 @@ import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.entity.saas.PlatTenant;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
+import com.makeit.enums.HeaderConst;
 import com.makeit.enums.report.DeviceNameEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.device.PlatDeviceMapper;
@@ -42,6 +44,7 @@ import com.makeit.module.iot.vo.DeviceState;
 import com.makeit.module.system.service.SysDictionaryCategoryService;
 import com.makeit.module.system.vo.DictionaryVo;
 import com.makeit.service.platform.auth.PlatOrgService;
+import com.makeit.service.platform.auth.PlatRoleService;
 import com.makeit.service.platform.device.PlatDeviceOtherService;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.space.PlatRegionSettingService;
@@ -54,6 +57,7 @@ import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.old.StringUtils;
+import com.makeit.utils.request.RequestUtil;
 import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.vo.platform.device.PlatDeviceListVO;
 import com.makeit.vo.platform.device.PlatDeviceViewVO;

--- a/server-service/src/main/resources/mappers/PlatDeviceMapper.xml
+++ b/server-service/src/main/resources/mappers/PlatDeviceMapper.xml
@@ -40,6 +40,13 @@
            <if test="param.orgId != null and param.orgId != '' ">
                and pd.org_id = #{param.orgId}
            </if>
+            <if test="param.orgIds != null and param.orgIds.size() > 0 ">
+                AND pd.org_id in
+                <foreach collection="param.orgIds" item="item" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
        </where>
        order by pd.update_date desc,prbd.update_date desc
    </select>