github/cool-admin-java
1
0
Fork 2
mirror of https://github.com/cool-team-official/cool-admin-java.git synced 2026-10-07 14:48:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade:

Browse Source 
1、R 返回值去掉 dataMap
2、basecontroller 插入和 批量插入都使用 id返回值
3、优化postgres支持 修改 com.mybatisflex.core.handler 为 com.cool.core.mybatis.handler
This commit is contained in:
ruying408
2025-05-11 21:04:45 +08:00
parent fc2a06d4b6
commit 509e2f1f4d
18 changed files with 552 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cool/modules/base/entity/sys/BaseSysLogEntity.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import java.util.List;
import lombok.Getter;
src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
+2 -4
View File
@@ -27,7 +27,6 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateChain;
import lombok.RequiredArgsConstructor;
import org.dromara.autotable.core.constants.DatabaseDialect;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -55,8 +54,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
// 用户的部门权限
Long[] permsDepartmentArr = coolCache.get("admin:department:" + tokenInfo.get("userId"),
Long[].class);
String databaseDialect = DatabaseDialectUtils.getDatabaseDialect();
if (databaseDialect.equals(DatabaseDialect.PostgreSQL)) {
if (DatabaseDialectUtils.isPostgresql()) {
// 兼容postgresql
qw.select("base_sys_user.id","base_sys_user.create_time","base_sys_user.department_id",
"base_sys_user.email","base_sys_user.head_img","base_sys_user.name","base_sys_user.nick_name",
@@ -96,7 +94,7 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
permsDepartmentArr == null || permsDepartmentArr.length == 0 ? new Long[]{null}
: permsDepartmentArr,
!CoolSecurityUtil.getAdminUsername().equals("admin")));
if (databaseDialect.equals(DatabaseDialect.PostgreSQL)) {
if (DatabaseDialectUtils.isPostgresql()) {
// 兼容postgresql
qw.groupBy("base_sys_user.id","base_sys_user.create_time","base_sys_user.department_id",
"base_sys_user.email","base_sys_user.head_img","base_sys_user.name","base_sys_user.nick_name",
src/main/java/com/cool/modules/plugin/entity/PluginInfoEntity.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.cool.core.base.BaseEntity;
import com.cool.core.config.PluginJson;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.mybatisflex.core.handler.JacksonTypeHandler;
import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
import com.cool.core.mybatis.handler.JacksonTypeHandler;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
import lombok.Getter;
src/main/java/com/cool/modules/recycle/entity/RecycleDataEntity.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.cool.modules.recycle.entity;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.cool.core.mybatis.handler.Fastjson2TypeHandler;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import java.util.List;
import java.util.Map;
src/main/java/com/cool/modules/task/run/ScheduleJob.java
+2 -1
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.cool.core.util.AutoTypeConverter;
import com.cool.modules.task.entity.TaskInfoEntity;
import com.cool.modules.task.entity.TaskLogEntity;
import com.cool.modules.task.service.TaskInfoLogService;
@@ -36,7 +37,7 @@ public class ScheduleJob extends QuartzJobBean {
Scheduler scheduler = SpringUtil.getBean(Scheduler.class);
TaskInfoEntity taskInfoEntity = taskInfoService
.getById(context.getJobDetail().getKey().getName().split("_")[1]);
.getById(AutoTypeConverter.autoConvert(context.getJobDetail().getKey().getName().split("_")[1]));
if (ObjUtil.isEmpty(taskInfoEntity)) {
log.warn("taskInfoEntity is null");
return;