From d276340363d4ec5a91fe39d9d04df65669536639 Mon Sep 17 00:00:00 2001 From: vertoryao Date: Fri, 20 Jun 2025 18:27:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(dify):=20dify-service-starter=E4=B8=8Eloca?= =?UTF-8?q?lDatetime=E4=B8=8D=E5=85=BC=E5=AE=B9=EF=BC=8C=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E4=B8=BADate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/dify/framework/json/JsonConfig.java | 8 ++++++++ .../mybatisplus/MyMetaObjectHandler.java | 18 ++++-------------- .../mybatisplus/MybatisPlusConfig.java | 1 + .../service/impl/BulletinServiceImpl.java | 9 +++++---- .../dify/modules/system/entity/BaseEntity.java | 6 ++++-- .../dify/domain/system/BaseEntityBuilder.java | 12 +++++++----- 6 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java b/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java index a27a341..ccdd40b 100644 --- a/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java +++ b/src/main/java/com/zsc/edu/dify/framework/json/JsonConfig.java @@ -20,4 +20,12 @@ public class JsonConfig { .serializationInclusion(JsonInclude.Include.NON_NULL) .serializationInclusion(JsonInclude.Include.NON_EMPTY); } + +// @Bean +// public ObjectMapper objectMapper() { +// return new ObjectMapper() +// .registerModule(new JavaTimeModule()) +// .setSerializationInclusion(JsonInclude.Include.NON_NULL) +// .setSerializationInclusion(JsonInclude.Include.NON_EMPTY); +// } } diff --git a/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MyMetaObjectHandler.java b/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MyMetaObjectHandler.java index edac839..2676f69 100644 --- a/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MyMetaObjectHandler.java +++ b/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MyMetaObjectHandler.java @@ -1,5 +1,6 @@ package com.zsc.edu.dify.framework.mybatisplus; + import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.zsc.edu.dify.framework.security.SecurityUtil; import com.zsc.edu.dify.framework.security.UserDetailsImpl; @@ -8,6 +9,7 @@ import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; import java.time.LocalDateTime; +import java.util.Date; /** * @author Yao @@ -20,16 +22,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { public void insertFill(MetaObject metaObject) { UserDetailsImpl userInfo = SecurityUtil.getUserInfo(); - 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, "createTime", Date.class, new Date()); this.strictInsertFill(metaObject, "createBy", String.class, userInfo.getUsername()); this.strictInsertFill(metaObject, "deptId", Long.class, userInfo.getDeptId()); this.strictInsertFill(metaObject, "createId", Long.class, userInfo.getCreateId()); @@ -39,10 +32,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { UserDetailsImpl userInfo = SecurityUtil.getUserInfo(); - if (userInfo.getUsername() == null) { - userInfo.setUsername("system"); - } - this.strictUpdateFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); + this.strictUpdateFill(metaObject, "updateTime", Date::new, Date.class); this.strictUpdateFill(metaObject, "updateBy", userInfo::getUsername, String.class); } diff --git a/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MybatisPlusConfig.java b/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MybatisPlusConfig.java index d84cf07..b0e4c20 100644 --- a/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MybatisPlusConfig.java +++ b/src/main/java/com/zsc/edu/dify/framework/mybatisplus/MybatisPlusConfig.java @@ -20,6 +20,7 @@ public class MybatisPlusConfig { public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); // 添加数据权限插件 + DataPermissionInterceptor dataPermissionInterceptor = new DataPermissionInterceptor(new DataScopeHandler()); // 添加自定义的数据权限处理器 interceptor.addInnerInterceptor(dataPermissionInterceptor); diff --git a/src/main/java/com/zsc/edu/dify/modules/message/service/impl/BulletinServiceImpl.java b/src/main/java/com/zsc/edu/dify/modules/message/service/impl/BulletinServiceImpl.java index 1989d42..4ac63de 100644 --- a/src/main/java/com/zsc/edu/dify/modules/message/service/impl/BulletinServiceImpl.java +++ b/src/main/java/com/zsc/edu/dify/modules/message/service/impl/BulletinServiceImpl.java @@ -1,5 +1,6 @@ package com.zsc.edu.dify.modules.message.service.impl; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -34,7 +35,7 @@ import static com.zsc.edu.dify.modules.message.entity.Bulletin.State.*; @Service public class BulletinServiceImpl extends ServiceImpl implements BulletinService { - private final BulletinMapper mapper; + private final BulletinMapper bulletinMapper; private final BulletinRepository repo; private final UserRepository userRepository; private final BulletinAttachmentRepository bulletinAttachmentRepository; @@ -69,7 +70,7 @@ public class BulletinServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java b/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java index 58d80d1..53a83c4 100644 --- a/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java +++ b/src/main/java/com/zsc/edu/dify/modules/system/entity/BaseEntity.java @@ -1,5 +1,6 @@ package com.zsc.edu.dify.modules.system.entity; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -11,6 +12,7 @@ import lombok.Setter; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** * @author harry yao @@ -41,7 +43,7 @@ public class BaseEntity implements Serializable { */ @TableField(value = "create_time", fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - public LocalDateTime createTime; + public Date createTime; /* * 创建人 * */ @@ -53,7 +55,7 @@ public class BaseEntity implements Serializable { */ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - public LocalDateTime updateTime; + public Date updateTime; /* * 更新人 * diff --git a/src/test/java/com/zsc/edu/dify/domain/system/BaseEntityBuilder.java b/src/test/java/com/zsc/edu/dify/domain/system/BaseEntityBuilder.java index a6c47ab..ecef8b9 100644 --- a/src/test/java/com/zsc/edu/dify/domain/system/BaseEntityBuilder.java +++ b/src/test/java/com/zsc/edu/dify/domain/system/BaseEntityBuilder.java @@ -1,6 +1,8 @@ package com.zsc.edu.dify.domain.system; -import java.time.LocalDateTime; + + +import java.util.Date; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; @@ -10,14 +12,14 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; public class BaseEntityBuilder { public Long id = -1L; public String remark; - public LocalDateTime createAt; - public LocalDateTime updateAt; + public Date createAt; + public Date updateAt; public Long createId; public BaseEntityBuilder() { remark = randomAlphabetic(5); - createAt = LocalDateTime.now(); - updateAt = LocalDateTime.now(); + createAt = new Date(); + updateAt = new Date(); createId = 1L; }