From 7ebf02161b023a253795254db16730c0dfc98cbd88fa551ca0e1b4030ecad2b7 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Mon, 1 Sep 2025 22:57:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staff/component/TenantInterceptor.java | 8 ++++--- .../EbikeOperatorStaffController.java | 2 +- .../com/cdzy/staff/model/dto/StaffInfo.java | 2 -- .../cdzy/staff/model/entity/EbikeRole.java | 10 ++++++-- .../impl/EbikeOperatorStaffServiceImpl.java | 2 ++ .../src/main/resources/application-dev.yml | 2 +- ebike-staff/src/main/resources/db/data.sql | 2 +- .../test/java/com/cdzy/staff/RoleTest.java | 24 +++++++++++++++++++ 8 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 ebike-staff/src/test/java/com/cdzy/staff/RoleTest.java diff --git a/ebike-staff/src/main/java/com/cdzy/staff/component/TenantInterceptor.java b/ebike-staff/src/main/java/com/cdzy/staff/component/TenantInterceptor.java index 7f41cd2..b2bb881 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/component/TenantInterceptor.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/component/TenantInterceptor.java @@ -2,6 +2,7 @@ package com.cdzy.staff.component; import cn.dev33.satoken.stp.StpUtil; import com.cdzy.staff.model.dto.StaffInfo; +import com.cdzy.staff.model.entity.EbikeOperatorStaff; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.jetbrains.annotations.NotNull; @@ -15,7 +16,8 @@ public class TenantInterceptor implements HandlerInterceptor { , @NotNull HttpServletResponse response, @NotNull Object handler) throws Exception { //通过 request 去获取租户 ID - if (StpUtil.isLogin()) { + boolean login = StpUtil.isLogin(); + if (login) { Long tenantId = getTenantIdByReuqest(request); //设置租户ID到 request 的 attribute request.setAttribute("tenantId", tenantId); @@ -27,7 +29,7 @@ public class TenantInterceptor implements HandlerInterceptor { Long getTenantIdByReuqest(HttpServletRequest request) { String token = request.getHeader("Authorization"); String id = (String) StpUtil.getLoginIdByToken(token); - StaffInfo staffDto = (StaffInfo) StpUtil.getSessionByLoginId(id).get(id); - return staffDto.getStaff().getOperatorId(); + EbikeOperatorStaff staffDto = (EbikeOperatorStaff) StpUtil.getSessionByLoginId(id).get(id); + return staffDto.getOperatorId(); } } \ No newline at end of file diff --git a/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeOperatorStaffController.java b/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeOperatorStaffController.java index 1ae1dde..c1072d2 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeOperatorStaffController.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/controller/EbikeOperatorStaffController.java @@ -46,7 +46,7 @@ public class EbikeOperatorStaffController { } /** - * 运营商员工登录。 + * 运营商员工添加。 * * @param staffVo 登录信息 * @return 结果 diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/dto/StaffInfo.java b/ebike-staff/src/main/java/com/cdzy/staff/model/dto/StaffInfo.java index 530bebb..6be6c99 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/model/dto/StaffInfo.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/model/dto/StaffInfo.java @@ -1,8 +1,6 @@ package com.cdzy.staff.model.dto; import com.cdzy.staff.model.entity.EbikeOperatorStaff; -import com.cdzy.staff.model.entity.EbikePermission; -import com.cdzy.staff.model.entity.EbikeRole; import lombok.Builder; import lombok.Data; diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java index 7bdbd17..4dc8b56 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java @@ -48,7 +48,13 @@ public class EbikeRole implements Serializable { @Column(onUpdateValue = "now()") private LocalDateTime updateTime; - @Column(isLogicDelete = true) - private Boolean isDeleted; + @Column(onInsertValue = "false") + private Boolean sysAdmin; + + @Column(onInsertValue = "false") + private Boolean operatorAdmin; + + + } diff --git a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java index a6e73a2..abb8cb9 100644 --- a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java +++ b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java @@ -46,6 +46,8 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl