From 7652b505f7c2b264d52f51666ebb8958ac2fd582 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Sun, 13 Jul 2025 22:33:10 +0800
Subject: [PATCH] =?UTF-8?q?:speech=5Fballoon:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=AD=97=E6=AE=B5roleName=E4=B8=BAroleCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/spring/step2/domain/dto/RoleDto.java   |  6 +++---
 .../com/spring/step2/domain/entity/RoleEntity.java  |  4 ++--
 .../java/com/spring/step2/domain/vo/RoleVo.java     |  4 ++--
 .../step-2/src/main/resources/mapper/RoleMapper.xml |  6 +++---
 .../resources/static/src/views/role/DialogRole.js   | 12 ++++++------
 .../src/main/resources/templates/rolePage.html      | 13 +++++++------
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/RoleDto.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/RoleDto.java
index 62b2bc5..0ed387b 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/RoleDto.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/RoleDto.java
@@ -19,9 +19,9 @@ public class RoleDto {
     @Schema(name = "id", title = "主键ID")
     private Long id;
 
-    @Schema(name = "roleName", title = "角色名称")
-    @NotBlank(message = "角色名称不能为空")
-    private String roleName;
+    @Schema(name = "roleCode", title = "角色码")
+    @NotBlank(message = "角色码不能为空")
+    private String roleCode;
 
     @Schema(name = "description", title = "角色描述")
     @NotBlank(message = "角色描述不能为空")
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/RoleEntity.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/RoleEntity.java
index 7b29a0e..b03408e 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/RoleEntity.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/RoleEntity.java
@@ -14,8 +14,8 @@ import lombok.experimental.Accessors;
 @Schema(name = "Role对象", title = "系统角色表", description = "系统角色表的实体类对象")
 public class RoleEntity extends BaseEntity {
 
-    @Schema(name = "roleName", title = "角色名称")
-    private String roleName;
+    @Schema(name = "roleCode", title = "角色码")
+    private String roleCode;
 
     @Schema(name = "description", title = "角色描述")
     private String description;
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/RoleVo.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/RoleVo.java
index 90effe5..4f2fc89 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/RoleVo.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/RoleVo.java
@@ -21,8 +21,8 @@ public class RoleVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    @Schema(name = "roleName", title = "角色名称")
-    private String roleName;
+    @Schema(name = "roleCode", title = "角色名称")
+    private String roleCode;
 
     @Schema(name = "description", title = "角色描述")
     private String description;
diff --git a/spring-security/step-2/src/main/resources/mapper/RoleMapper.xml b/spring-security/step-2/src/main/resources/mapper/RoleMapper.xml
index 146b056..006d0c1 100644
--- a/spring-security/step-2/src/main/resources/mapper/RoleMapper.xml
+++ b/spring-security/step-2/src/main/resources/mapper/RoleMapper.xml
@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.spring.step2.domain.entity.RoleEntity">
         <id column="id" property="id"/>
-        <id column="role_name" property="roleName"/>
+        <id column="role_name" property="roleCode"/>
         <id column="description" property="description"/>
         <id column="remark" property="remark"/>
         <id column="create_time" property="createTime"/>
@@ -30,8 +30,8 @@
             <if test="dto.id != null and dto.id != ''">
                 and id like CONCAT('%',#{dto.id},'%')
             </if>
-            <if test="dto.roleName != null and dto.roleName != ''">
-                and role_name like CONCAT('%',#{dto.roleName},'%')
+            <if test="dto.roleCode != null and dto.roleCode != ''">
+                and role_code like CONCAT('%',#{dto.roleCode},'%')
             </if>
             <if test="dto.description != null and dto.description != ''">
                 and description like CONCAT('%',#{dto.description},'%')
diff --git a/spring-security/step-2/src/main/resources/static/src/views/role/DialogRole.js b/spring-security/step-2/src/main/resources/static/src/views/role/DialogRole.js
index 2edde7a..4056a06 100644
--- a/spring-security/step-2/src/main/resources/static/src/views/role/DialogRole.js
+++ b/spring-security/step-2/src/main/resources/static/src/views/role/DialogRole.js
@@ -1,8 +1,8 @@
-const DialogRole = {
+const DialogRole = defineComponent({
     name: "DialogRole",
     template: `
         <div class="modal fade" id="roleBackdrop" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1"
-            aria-labelledby="roleBackdropLabel" aria-hidden="true" ref="modalRef">
+            aria-labelledby="roleBackdropLabel" ref="modalRef">
             <div class="modal-dialog">
                 <div class="modal-content">
         
@@ -16,9 +16,9 @@ const DialogRole = {
                         <!-- 内容 -->
                         <div class="modal-body">
                             <div class="mb-3">
-                                <label class="form-label" for="dialogRoleName"><i class="fas fa-user-alt me-1"></i>角色名</label>
-                                <input autocomplete="false" class="form-control" id="dialogRoleName" placeholder="请输入角色名"
-                                    type="text" v-model="form.roleName" required>
+                                <label class="form-label" for="dialogRoleCode"><i class="fas fa-user-alt me-1"></i>角色名</label>
+                                <input autocomplete="false" class="form-control" id="dialogRoleCode" placeholder="请输入角色名"
+                                    type="text" v-model="form.roleCode" required>
                                 <div class="form-text">在这里输入你的角色名。</div>
                             </div>
                             <div class="mb-3">
@@ -94,4 +94,4 @@ const DialogRole = {
             this.modalInstance.dispose();
         }
     }
-};
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/spring-security/step-2/src/main/resources/templates/rolePage.html b/spring-security/step-2/src/main/resources/templates/rolePage.html
index df11dd9..e4834b0 100644
--- a/spring-security/step-2/src/main/resources/templates/rolePage.html
+++ b/spring-security/step-2/src/main/resources/templates/rolePage.html
@@ -44,9 +44,9 @@
             <form @reset="onRest" @submit.prevent="onSearch">
                 <div class="row g-3 align-items-center">
                     <div class="col-md-4">
-                        <label class="form-label" for="roleName"><i class="fas fa-user-alt me-1"></i>角色名</label>
-                        <input autocomplete="false" class="form-control" id="roleName" placeholder="请输入角色名"
-                               type="text" v-model="searchForm.roleName">
+                        <label class="form-label" for="roleCode"><i class="fas fa-user-alt me-1"></i>角色名</label>
+                        <input autocomplete="false" class="form-control" id="roleCode" placeholder="请输入角色名"
+                               type="text" v-model="searchForm.roleCode">
                     </div>
                     <div class="col-md-4">
                         <label class="form-label" for="description"><i class="fas fa-text-width me-1"></i>描述</label>
@@ -98,7 +98,7 @@
                     <tbody>
                     <tr :key="role.id" v-for="(role,index) in dataList">
                         <th scope="row">{{index + 1}}</th>
-                        <td>{{role.roleName}}</td>
+                        <td>{{role.roleCode}}</td>
                         <td>{{role.description}}</td>
                         <td>{{role.remark}}</td>
                         <td>{{formatDate(role.createTime)}}</td>
@@ -142,7 +142,7 @@
             return {
                 // 查询表单
                 searchForm: ref({
-                    roleName: undefined,
+                    roleCode: undefined,
                     description: undefined,
                     remark: undefined,
                     pageNo: 1,
@@ -181,8 +181,9 @@
 
             /* 重制表单 */
             onRest() {
-                this.searchForm.roleName = undefined;
+                this.searchForm.roleCode = undefined;
                 this.searchForm.description = undefined;
+                this.searchForm.remark = undefined;
                 this.onSearch();
             },