数据权限调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.pms.config;
 
 import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer;
+import cn.iocoder.yudao.module.pms.dal.dataobject.IotTreeDO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
@@ -22,10 +23,12 @@ public class PmsDataPermissionConfiguration {
             rule.addDeptColumn(SupplierDO.class);
             rule.addDeptColumn(DeptDO.class, "id");
             rule.addDeptColumn(SupplierDO.class, "dept_id");
+            rule.addDeptColumn(IotTreeDO.class,"dept_id");
             // user
             rule.addUserColumn(SupplierDO.class);
             rule.addUserColumn(AdminUserDO.class, "id");
             rule.addUserColumn(SupplierDO.class, "creator");
+
         };
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotTreeListReqVO.java

@@ -17,4 +17,5 @@ public class IotTreeListReqVO {
     private Long originId;
     @Schema(description = "类型")
     private String type;
+    private Long deptId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotTreePageReqVO.java

@@ -38,5 +38,6 @@ public class IotTreePageReqVO extends PageParam {
 
     @Schema(description = "备注", example = "随便")
     private String remark;
+    private Long deptId;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotTreeRespVO.java

@@ -47,4 +47,5 @@ public class IotTreeRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    private String deptId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotTreeSaveReqVO.java

@@ -37,4 +37,5 @@ public class IotTreeSaveReqVO {
     @Schema(description = "备注", example = "随便")
     private String remark;
 
+    private Long deptId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotTreeSimpleRespVO.java

@@ -26,4 +26,5 @@ public class IotTreeSimpleRespVO {
     private Long originId;
     @Schema(description = "类型")
     private String type;
+    private Long deptId;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotTreeDO.java

@@ -53,4 +53,6 @@ public class IotTreeDO extends BaseDO {
      */
     private String remark;
 
+    private Long deptId;
+
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotDeviceServiceImpl.java

@@ -67,6 +67,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         iotTreeDO.setType("device");
         iotTreeDO.setOriginId(iotDevice.getId());
         iotTreeDO.setName(iotDevice.getDeviceName());
+        iotTreeDO.setDeptId(iotDevice.getDeptId());
         List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectListByOriginId(iotDevice.getDeptId(),"dept");
         if (CollUtil.isNotEmpty(iotTreeDOS)) {
             iotTreeDO.setParentId(Objects.nonNull(iotTreeDOS.get(0)) ? iotTreeDOS.get(0).getId() : 0);
@@ -90,6 +91,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         }
         IotTreeDO iotTreeDO = iotTreeDOS.get(0);
         iotTreeDO.setName(updateObj.getDeviceName());
+        iotTreeDO.setDeptId(updateObj.getDeptId());
         iotTreeMapper.updateById(iotTreeDO);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotInfoClassifyServiceImpl.java

@@ -70,6 +70,7 @@ public class IotInfoClassifyServiceImpl implements IotInfoClassifyService {
         iotTreeDO.setType("file");
         iotTreeDO.setOriginId(infoClassifyDO.getId());
         iotTreeDO.setName(infoClassifyDO.getName());
+        iotTreeDO.setDeptId(infoClassifyDO.getDeptId());
         List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectListByOriginId(infoClassifyDO.getDeviceId(),"device");
         if (CollUtil.isNotEmpty(iotTreeDOS)) {
             iotTreeDO.setParentId(Objects.nonNull(iotTreeDOS.get(0)) ? iotTreeDOS.get(0).getId() : 0);
@@ -108,6 +109,7 @@ public class IotInfoClassifyServiceImpl implements IotInfoClassifyService {
         IotTreeDO iotTreeDO = iotTreeDOS.get(0);
         iotTreeDO.setName(updateObj.getName());
         iotTreeDO.setParentId(parentIotTreeDOS.get(0).getId());
+        iotTreeDO.setDeptId(updateObj.getDeptId());
         iotTreeMapper.updateById(iotTreeDO);
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/IotTreeServiceImpl.java

@@ -48,6 +48,7 @@ public class IotTreeServiceImpl implements IotTreeService {
         iotTreeDO.setType("dept");
         iotTreeDO.setOriginId(dept.getId());
         iotTreeDO.setName(dept.getName());
+        iotTreeDO.setDeptId(dept.getId());
         List<IotTreeDO> iotTreeDOS = iotTreeMapper.selectListByOriginId(dept.getParentId(),"dept");
 //        if (CollUtil.isNotEmpty(iotTreeDOS)) {
         iotTreeDO.setParentId(CollUtil.isNotEmpty(iotTreeDOS) ? iotTreeDOS.get(0).getId() : 0);
@@ -63,6 +64,7 @@ public class IotTreeServiceImpl implements IotTreeService {
         }
         IotTreeDO iotTreeDO = iotTreeDOS.get(0);
         iotTreeDO.setName(updateObj.getName());
+        iotTreeDO.setDeptId(updateObj.getId());
         iotTreeMapper.updateById(iotTreeDO);
     }