feat(framework): 添加数据权限注解并优化相关功能

- 新增 @DataPermission 注解用于方法级别数据权限控制
- 在多个控制器中添加 @DataPermission 注解以启用数据权限
- 优化部分实体类和 Mapper XML 文件以支持数据权限
- 重构部分查询方法以适应数据权限控制

src/main/java/com/zsc/edu/gateway/framework/mybatisplus/DataPermission.java

@@ -2,6 +2,9 @@ package com.zsc.edu.gateway.framework.mybatisplus;
 
 import java.lang.annotation.*;
 
+/**
+ * @author vertoryao
+ */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented

src/main/java/com/zsc/edu/gateway/framework/mybatisplus/DataScopeHandler.java

@@ -7,7 +7,6 @@ import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
-import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;

src/main/java/com/zsc/edu/gateway/framework/mybatisplus/DataScopeType.java

@@ -2,7 +2,6 @@ package com.zsc.edu.gateway.framework.mybatisplus;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 
 @AllArgsConstructor
 public enum DataScopeType implements IEnum<Integer> {

src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java

@@ -1,6 +1,7 @@
 package com.zsc.edu.gateway.modules.iot.device.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.modules.iot.device.dto.BatchDeviceDto;
 import com.zsc.edu.gateway.modules.iot.device.dto.DeviceDto;
 import com.zsc.edu.gateway.modules.iot.device.dto.DeviceServeDto;
@@ -63,6 +64,7 @@ public class DeviceController {
     /**
      * 分页查询设备
      */
+    @DataPermission
     @GetMapping
     @PreAuthorize("hasAuthority('iot:device:query')")
     public Page<Device> query(Page<Device> page, DeviceQuery query) {

src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/Device.java

@@ -90,6 +90,7 @@ public class Device extends BaseEntity {
     @TableField(exist = false)
     public Product product;
 
+
     public enum Status implements IEnum<Integer>, IState<Status> {
         UNACTIVATED(0, "未激活"),
         LOCKED(1, "已锁定"),

src/main/java/com/zsc/edu/gateway/modules/message/controller/BulletinController.java

@@ -1,6 +1,7 @@
 package com.zsc.edu.gateway.modules.message.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import com.zsc.edu.gateway.modules.message.dto.BulletinDto;
 import com.zsc.edu.gateway.modules.message.entity.Bulletin;
@@ -42,6 +43,7 @@ public class BulletinController {
      * @param query    查询表单
      * @return 分页数据
      */
+    @DataPermission
     @GetMapping("/self")
     public Page<Bulletin> getBulletins(Page<Bulletin> page, BulletinQuery query) {
         query.setState(Bulletin.State.publish);
@@ -66,7 +68,8 @@ public class BulletinController {
      * @param query    查询参数
      * @return 分页数据
      */
-    @GetMapping()
+    @DataPermission
+    @GetMapping
     @PreAuthorize("hasAuthority('message:bulletin:query')")
     public Page<Bulletin> query(Page<Bulletin> page, BulletinQuery query) {
         return service.page(page, query.wrapper());

src/main/java/com/zsc/edu/gateway/modules/message/controller/UserNoticeController.java

@@ -2,6 +2,7 @@ package com.zsc.edu.gateway.modules.message.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import com.zsc.edu.gateway.modules.message.dto.UserNoticeDto;
 import com.zsc.edu.gateway.modules.message.query.AdminNoticeQuery;
@@ -47,6 +48,7 @@ public class UserNoticeController {
      * @param query       查询参数
      * @return 分页数据
      */
+    @DataPermission(tableAlias = "su")
     @GetMapping("/self")
     public IPage<UserNoticeVo> selfPage(Page<UserNoticeVo> pageParam, @AuthenticationPrincipal UserDetailsImpl userDetails, UserNoticeQuery query) {
         query.userId = userDetails.id;
@@ -106,6 +108,7 @@ public class UserNoticeController {
      * @param query 查询参数
      * @return 分页数据
      */
+    @DataPermission(tableAlias = "su")
     @GetMapping
     @PreAuthorize("hasAuthority('message:notice:query')")
     public IPage<AdminNoticeVo> page(Page<AdminNoticeVo> page, AdminNoticeQuery query) {

src/main/java/com/zsc/edu/gateway/modules/message/query/AdminNoticeQuery.java

@@ -1,11 +1,15 @@
 package com.zsc.edu.gateway.modules.message.query;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zsc.edu.gateway.modules.message.entity.Bulletin;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 /**
  * @author zhuang
@@ -35,4 +39,5 @@ public class AdminNoticeQuery {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public LocalDateTime createAtEnd;
+
 }

src/main/java/com/zsc/edu/gateway/modules/system/controller/DeptController.java

@@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.system.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zsc.edu.gateway.exception.ConstraintException;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.modules.system.dto.DeptDto;
 import com.zsc.edu.gateway.modules.system.entity.Dept;
 import com.zsc.edu.gateway.modules.system.entity.User;
@@ -29,11 +30,12 @@ public class DeptController {
     private final UserService userService;
 
     /**
-     * 返回管理部门列表 hasAuthority('SYSTEM:DEPT:QUERY')
+     * 返回管理部门分页 hasAuthority('SYSTEM:DEPT:QUERY')
      *
      * @param query 查询表单
      * @return 部门列表
      */
+    @DataPermission
     @GetMapping
     @PreAuthorize("hasAuthority('system:dept:query')")
     public Page<Dept> query(DeptQuery query, Page<Dept> page) {

src/main/java/com/zsc/edu/gateway/modules/system/controller/MenuController.java

@@ -1,5 +1,6 @@
 package com.zsc.edu.gateway.modules.system.controller;
 
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import com.zsc.edu.gateway.modules.system.dto.MenuDto;
 import com.zsc.edu.gateway.modules.system.entity.Menu;
@@ -52,6 +53,7 @@ public class MenuController {
     /**
      * 根据名字返回树
      */
+    @DataPermission
     @GetMapping("/tree")
     @PreAuthorize("hasAuthority('system:menu:query')")
     public List<MenuVo> tree(@AuthenticationPrincipal UserDetailsImpl userDetails, @RequestParam String name) {

src/main/java/com/zsc/edu/gateway/modules/system/controller/RoleController.java

@@ -1,6 +1,7 @@
 package com.zsc.edu.gateway.modules.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.modules.system.dto.AuthorityCreateDto;
 //import com.zsc.edu.gateway.modules.system.dto.RoleAuthCreateDto;
 import com.zsc.edu.gateway.modules.system.dto.RoleDto;
@@ -33,6 +34,7 @@ public class RoleController {
      *
      * @return 所有角色列表
      */
+    @DataPermission
     @GetMapping
     @PreAuthorize("hasAuthority('system:role:query')")
     public Page<Role> query(RoleQuery query, Page<Role> page) {

src/main/java/com/zsc/edu/gateway/modules/system/controller/UserController.java

@@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.system.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zsc.edu.gateway.framework.mybatisplus.DataPermission;
 import com.zsc.edu.gateway.framework.security.UserDetailsImpl;
 import com.zsc.edu.gateway.modules.system.dto.UserCreateDto;
 import com.zsc.edu.gateway.modules.system.dto.UserSelfUpdateDto;
@@ -110,6 +111,7 @@ public class UserController {
      * @param page 分页
      * @return 分页用户信息
      */
+    @DataPermission
     @GetMapping
     @PreAuthorize("hasAuthority('system:user:query')")
     public Page<User> query(UserQuery query, Page<User> page) {

src/main/java/com/zsc/edu/gateway/modules/system/entity/BaseEntity.java

@@ -28,6 +28,11 @@ public class BaseEntity implements Serializable {
      */
     public String remark;
 
+    /**
+     * 创建者ID
+     */
+    public Long createId;
+
     /**
      * 创建时间
      */

src/main/resources/mappers/iot/ProductMapper.xml

@@ -15,6 +15,7 @@
         <result column="create_time" jdbcType="DATE" property="createTime"/>
         <result column="update_time" jdbcType="DATE" property="updateTime"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="create_id" jdbcType="BIGINT" property="createId"/>
         <collection property="params" ofType="com.zsc.edu.gateway.modules.iot.tsl.entity.Param" autoMapping="true"
                     columnPrefix="param_">
             <id column="id" property="id"/>

src/main/resources/mappers/notice/UserNoticeMapper.xml

@@ -49,9 +49,12 @@
 
     <select id="page" resultType="com.zsc.edu.gateway.modules.message.vo.UserNoticeVo" resultMap="userNoticeMap">
         select sun.*,sn.*,su.username,su.address,su.avatar,su.name
-        from sys_user_notice sun
+        FROM
-        left join sys_user su on sun.user_id = su.id
+        sys_user su
-        left join sys_notice sn on sn.id = sun.notice_id
+        LEFT JOIN
+        sys_user_notice sun ON sun.user_id = su.id
+        LEFT JOIN
+        sys_notice sn ON sn.id = sun.notice_id
         <where>
             <if test="query.userId != null">
                 AND sun.user_id = #{query.userId}
@@ -85,9 +88,9 @@
         COUNT(DISTINCT sun.user_id) AS user_count, -- 统计用户的关联数量
         SUM(CASE WHEN sun.is_read = true THEN 1 ELSE 0 END) AS read_count -- 统计已读数量
         FROM
-        sys_user_notice sun
+        sys_user su
         LEFT JOIN
-        sys_user su ON sun.user_id = su.id
+        sys_user_notice sun ON sun.user_id = su.id
         LEFT JOIN
         sys_notice sn ON sn.id = sun.notice_id
         <where>