From 2630c7fef0d723ba84974d6e94f4b2bcaff3019e Mon Sep 17 00:00:00 2001 From: mirage <1127314491@qq.com> Date: Tue, 31 Mar 2026 11:27:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=B0=86=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=94=B9=E6=88=90=E8=AF=BB=E6=9C=AC=E5=9C=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=202.=20=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/admin/AdminRoleServiceImpl.java | 7 +++---- .../main/java/com/mdd/common/entity/admin/AdminDept.java | 5 +++++ .../main/java/com/mdd/common/entity/admin/AdminJobs.java | 5 +++++ .../main/java/com/mdd/common/entity/admin/AdminRole.java | 7 +++++-- .../java/com/mdd/common/entity/system/SystemRoleMenu.java | 7 +++++-- .../java/com/mdd/common/mapper/admin/AdminRoleMapper.java | 1 - .../{application-dev-example.yml => application-dev.yml} | 8 ++++---- server/like-front/src/main/resources/application.yml | 4 ++-- 8 files changed, 29 insertions(+), 15 deletions(-) rename server/like-front/src/main/resources/{application-dev-example.yml => application-dev.yml} (71%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminRoleServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminRoleServiceImpl.java index 1bd71425..5dad3de1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminRoleServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminRoleServiceImpl.java @@ -2,8 +2,6 @@ package com.mdd.admin.service.impl.admin; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.admin.IAdminRoleService; -import com.mdd.common.entity.admin.Admin; -import com.mdd.common.entity.admin.AdminJobs; import com.mdd.common.entity.admin.AdminRole; import com.mdd.common.mapper.admin.AdminRoleMapper; import org.springframework.stereotype.Service; @@ -19,6 +17,7 @@ public class AdminRoleServiceImpl implements IAdminRoleService { @Resource AdminRoleMapper adminRoleMapper; + @Override public List getRoleIdAttr(Integer adminId) { List ret = new ArrayList<>(); @@ -41,8 +40,8 @@ public class AdminRoleServiceImpl implements IAdminRoleService { public void batchInsert(Integer adminId, List roleIds) { this.deleteByAdminId(adminId); if (roleIds != null && !roleIds.isEmpty()) { - roleIds.forEach(item-> { - this.adminRoleMapper.insert(new AdminRole(){{ + roleIds.forEach(item -> { + this.adminRoleMapper.insert(new AdminRole() {{ setAdminId(adminId); setRoleId(item); }}); diff --git a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java index 11bef926..3ac28c0e 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminDept.java @@ -1,5 +1,7 @@ package com.mdd.common.entity.admin; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,14 +10,17 @@ import java.io.Serializable; @Data @ApiModel("部门关联表实体") +@TableName("la_admin_dept") public class AdminDept implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("管理员id") + @TableField("admin_id") private Integer adminId; @ApiModelProperty("部门id") + @TableField("dept_id") private Integer deptId; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java index 644c1014..613f843f 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminJobs.java @@ -1,5 +1,7 @@ package com.mdd.common.entity.admin; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,14 +10,17 @@ import java.io.Serializable; @Data @ApiModel("岗位关联表实体") +@TableName("la-admin_jobs") public class AdminJobs implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("管理员id") + @TableField("admin_id") private Integer adminId; @ApiModelProperty("岗位id") + @TableField("jobs_id") private Integer jobsId; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminRole.java b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminRole.java index d74b0aa9..6689c090 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminRole.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/admin/AdminRole.java @@ -1,7 +1,7 @@ package com.mdd.common.entity.admin; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,14 +10,17 @@ import java.io.Serializable; @Data @ApiModel("角色关联表实体") +@TableName("la_admin_role") public class AdminRole implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("管理员id") + @TableField("admin_id") private Integer adminId; @ApiModelProperty("角色id") + @TableField("role_id") private Integer roleId; diff --git a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java index 18fe1723..8ade5def 100644 --- a/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java +++ b/server/like-common/src/main/java/com/mdd/common/entity/system/SystemRoleMenu.java @@ -1,7 +1,7 @@ package com.mdd.common.entity.system; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,14 +10,17 @@ import java.io.Serializable; @Data @ApiModel("角色菜单关系实体") +@TableName("la_system_role_menu") public class SystemRoleMenu implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("角色ID") + @TableField("role_id") private Integer roleId; @ApiModelProperty("菜单ID") + @TableField("menu_id") private Integer menuId; } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminRoleMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminRoleMapper.java index 688c2052..17287e2c 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminRoleMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminRoleMapper.java @@ -1,7 +1,6 @@ package com.mdd.common.mapper.admin; import com.mdd.common.core.basics.IBaseMapper; -import com.mdd.common.entity.admin.Admin; import com.mdd.common.entity.admin.AdminRole; import org.apache.ibatis.annotations.Mapper; diff --git a/server/like-front/src/main/resources/application-dev-example.yml b/server/like-front/src/main/resources/application-dev.yml similarity index 71% rename from server/like-front/src/main/resources/application-dev-example.yml rename to server/like-front/src/main/resources/application-dev.yml index 3e4c0857..32ebabf5 100644 --- a/server/like-front/src/main/resources/application-dev-example.yml +++ b/server/like-front/src/main/resources/application-dev.yml @@ -8,16 +8,16 @@ spring: property-naming-strategy: SNAKE_CASE #下划线返回值和获取值 # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/la?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/la?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.cj.jdbc.Driver # MySql的驱动 username: root # 数据库账号 - password: 123456 # 数据库密码 + password: 11111111 # 数据库密码 # Redis配置 redis: - host: localhost # Redis服务地址 + host: 127.0.0.1 # Redis服务地址 port: 6379 # Redis端口 - password: # Redis密码 + password: 11111111 # Redis密码 database: 0 # 数据库索引 diff --git a/server/like-front/src/main/resources/application.yml b/server/like-front/src/main/resources/application.yml index fc5ac4f1..c03ee8a9 100644 --- a/server/like-front/src/main/resources/application.yml +++ b/server/like-front/src/main/resources/application.yml @@ -26,7 +26,7 @@ spring: matching-strategy: ant_path_matcher # 数据源配置 datasource: - url: jdbc:mysql://8.153.111.6:3306/la?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/la?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false type: com.zaxxer.hikari.HikariDataSource # 数据源类型 driver-class-name: com.mysql.cj.jdbc.Driver # MySql的驱动 username: root # 数据库账号 @@ -48,7 +48,7 @@ spring: enabled: true # Redis配置 redis: - host: 8.153.111.6 # Redis服务地址 + host: 127.0.0.1 # Redis服务地址 port: 6379 # Redis端口 password: 11111111 # Redis密码 database: 0 # 数据库索引