From da24f15ca277afa259791e706cb54690bd45f516 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Fri, 28 Feb 2025 16:59:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(iot):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E3=80=81=E4=BA=A7=E5=93=81=E5=92=8C=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BaseEntity、BaseParam、Device、Product 类中添加 createId 和 deptId 字段 - 在 MyMetaObjectHandler 中添加对 createId 和 deptId 的自动填充逻辑 - 在 UserDetailsImpl 中添加 deptId 和 createId 属性，用于获取当前用户信息 --- .../framework/mybatisplus/MyMetaObjectHandler.java | 8 ++++++++ .../gateway/framework/security/UserDetailsImpl.java | 8 ++++++-- .../edu/gateway/modules/iot/device/entity/Device.java | 7 +++++++ .../gateway/modules/iot/product/entity/Product.java | 3 +++ .../edu/gateway/modules/iot/tsl/entity/BaseParam.java | 11 ++++++++--- .../edu/gateway/modules/system/entity/BaseEntity.java | 1 + 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zsc/edu/gateway/framework/mybatisplus/MyMetaObjectHandler.java b/src/main/java/com/zsc/edu/gateway/framework/mybatisplus/MyMetaObjectHandler.java index b119c60..68b68df 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/mybatisplus/MyMetaObjectHandler.java +++ b/src/main/java/com/zsc/edu/gateway/framework/mybatisplus/MyMetaObjectHandler.java @@ -24,8 +24,16 @@ public class MyMetaObjectHandler implements MetaObjectHandler { if (userInfo.getUsername() == null) { userInfo.setUsername("system"); } + if (userInfo.getDeptId() == null) { + userInfo.setDeptId(2L); + } + if (userInfo.getCreateId() == null) { + userInfo.setCreateId(1L); + } this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now()); this.strictInsertFill(metaObject, "createBy", String.class, userInfo.getUsername()); + this.strictInsertFill(metaObject, "deptId", Long.class, userInfo.getDeptId()); + this.strictInsertFill(metaObject, "createId", Long.class, userInfo.getCreateId()); } diff --git a/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java b/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java index 467e338..b1bf2eb 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java +++ b/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java @@ -37,8 +37,10 @@ public class UserDetailsImpl implements UserDetails { public Set authorities; public Set permissions; public Set dataScopeDeptIds; + public Long deptId; + public Long createId; - public UserDetailsImpl(Long id, String username, String password, String name, Boolean enableState, Dept dept, Set dataScopeDeptIds, Role role, Set authorities, Set permissions, List roles) { + public UserDetailsImpl(Long id, String username, String password, String name, Boolean enableState, Dept dept, Set dataScopeDeptIds, Role role, Set authorities, Set permissions, List roles, Long deptId, Long createId) { this.id = id; this.username = username; this.password = password; @@ -64,7 +66,9 @@ public class UserDetailsImpl implements UserDetails { user.role, user.role.authorities, permissions, - user.roles + user.roles, + user.deptId, + user.createId ); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/Device.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/Device.java index 372fbda..4198909 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/Device.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/entity/Device.java @@ -1,5 +1,6 @@ package com.zsc.edu.gateway.modules.iot.device.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -91,6 +92,12 @@ public class Device extends BaseEntity { @TableField(exist = false) public Product product; + /** + * 所属部门 + */ + @TableField(value = "dept_id", fill = FieldFill.INSERT) + public Long deptId; + public enum Status implements IEnum, IState { UNACTIVATED(0, "未激活"), diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java index 49e5e6e..f1938f8 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/entity/Product.java @@ -1,5 +1,6 @@ package com.zsc.edu.gateway.modules.iot.product.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -32,6 +33,7 @@ public class Product extends BaseEntity { /** * 部门ID */ + @TableField(value = "dept_id", fill = FieldFill.INSERT) private Long deptId; /** * 产品类型 @@ -54,6 +56,7 @@ public class Product extends BaseEntity { @TableField(exist = false) private Set params; + /** * 接入方式 */ diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/BaseParam.java b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/BaseParam.java index 4b57744..b3980a4 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/BaseParam.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/tsl/entity/BaseParam.java @@ -1,8 +1,6 @@ package com.zsc.edu.gateway.modules.iot.tsl.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -43,6 +41,13 @@ public class BaseParam implements Serializable { /** * 部门ID(权限) */ + @TableField(value = "dept_id", fill = FieldFill.INSERT) public Long deptId; + /** + * 创建人ID(权限) + */ + @TableField(value = "create_id", fill = FieldFill.INSERT) + public Long createId; + } diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/entity/BaseEntity.java b/src/main/java/com/zsc/edu/gateway/modules/system/entity/BaseEntity.java index 44748cc..446b1af 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/entity/BaseEntity.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/entity/BaseEntity.java @@ -31,6 +31,7 @@ public class BaseEntity implements Serializable { /** * 创建者ID */ + @TableField(value = "create_id", fill = FieldFill.INSERT) public Long createId; /**