页面和权限规则调整
This commit is contained in:
+16
-6
@@ -3,11 +3,13 @@ package cn.iocoder.yudao.framework.mybatis.config;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.handler.DefaultDBFieldHandler;
|
||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
||||
import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.core.config.GlobalConfig;
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.session.SqlSession;
|
||||
import org.apache.ibatis.session.SqlSessionFactory;
|
||||
@@ -34,6 +36,7 @@ import java.util.Map;
|
||||
lazyInitialization = "${mybatis.lazy-initialization:false}") // Mapper 懒加载，目前仅用于单元测试
|
||||
})
|
||||
@Configuration
|
||||
@Slf4j
|
||||
public class YudaoMybatisAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@@ -55,11 +58,7 @@ public class YudaoMybatisAutoConfiguration {
|
||||
MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean();
|
||||
Map<String, DataSource> map = dynamicDataSourceProvider.loadDataSources();
|
||||
factory.setDataSource(map.get("master"));
|
||||
GlobalConfig globalConfig = new GlobalConfig();
|
||||
globalConfig.setMetaObjectHandler(defaultMetaObjectHandler());
|
||||
factory.setPlugins(mybatisPlusInterceptor());
|
||||
factory.setGlobalConfig(globalConfig);
|
||||
return factory.getObject();
|
||||
return getSqlSessionFactory(factory);
|
||||
}
|
||||
|
||||
@Bean("shangcheng")
|
||||
@@ -67,8 +66,19 @@ public class YudaoMybatisAutoConfiguration {
|
||||
MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean();
|
||||
Map<String, DataSource> map = dynamicDataSourceProvider.loadDataSources();
|
||||
factory.setDataSource(map.get("xiaohui"));
|
||||
return factory.getObject();
|
||||
return getSqlSessionFactory(factory);
|
||||
}
|
||||
|
||||
private SqlSessionFactory getSqlSessionFactory(MybatisSqlSessionFactoryBean factory) throws Exception {
|
||||
GlobalConfig globalConfig = new GlobalConfig();
|
||||
GlobalConfig.DbConfig dbConfig = new GlobalConfig.DbConfig();
|
||||
dbConfig.setIdType(IdType.AUTO);
|
||||
log.error("dbConfig:{}",dbConfig);
|
||||
globalConfig.setDbConfig(dbConfig);
|
||||
globalConfig.setMetaObjectHandler(defaultMetaObjectHandler());
|
||||
factory.setPlugins(mybatisPlusInterceptor());
|
||||
factory.setGlobalConfig(globalConfig);
|
||||
return factory.getObject();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package cn.iocoder.yudao.framework.mybatis.core.dataobject;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* @ClassName 公共模型
|
||||
* @Author hupeng <610796224@qq.com>
|
||||
* @Date 2020/6/13
|
||||
**/
|
||||
@Getter
|
||||
@Setter
|
||||
public class BaseDomain implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
@TableField(fill= FieldFill.INSERT)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
|
||||
@TableField(fill= FieldFill.UPDATE)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date updateTime;
|
||||
|
||||
@TableLogic
|
||||
@JsonIgnore
|
||||
@TableField(fill= FieldFill.INSERT)
|
||||
private Integer isDel;
|
||||
}
|
||||
+50
-45
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.mybatis.core.handler;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||
import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.ibatis.reflection.MetaObject;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
@@ -16,57 +17,61 @@ import java.util.Objects;
|
||||
*
|
||||
* @author hexiaowu
|
||||
*/
|
||||
@Slf4j
|
||||
public class DefaultDBFieldHandler implements MetaObjectHandler {
|
||||
|
||||
@Override
|
||||
public void insertFill(MetaObject metaObject) {
|
||||
if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) {
|
||||
BaseDO baseDO = (BaseDO) metaObject.getOriginalObject();
|
||||
// if (Objects.nonNull(metaObject) && metaObject.getOriginalObject() instanceof BaseDO) {
|
||||
// BaseDO baseDO = (BaseDO) metaObject.getOriginalObject();
|
||||
//
|
||||
// Date current = new Date();
|
||||
// // 创建时间为空，则以当前时间为插入时间
|
||||
// if (Objects.isNull(baseDO.getCreateTime())) {
|
||||
// baseDO.setCreateTime(current);
|
||||
// }
|
||||
// // 更新时间为空，则以当前时间为更新时间
|
||||
// if (Objects.isNull(baseDO.getUpdateTime())) {
|
||||
// baseDO.setUpdateTime(current);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
Date current = new Date();
|
||||
// 创建时间为空，则以当前时间为插入时间
|
||||
if (Objects.isNull(baseDO.getCreateTime())) {
|
||||
baseDO.setCreateTime(current);
|
||||
}
|
||||
// 更新时间为空，则以当前时间为更新时间
|
||||
if (Objects.isNull(baseDO.getUpdateTime())) {
|
||||
baseDO.setUpdateTime(current);
|
||||
}
|
||||
|
||||
Long userId = WebFrameworkUtils.getLoginUserId();
|
||||
// 当前登录用户不为空，创建人为空，则当前登录用户为创建人
|
||||
if (Objects.nonNull(userId) && Objects.isNull(baseDO.getCreator())) {
|
||||
baseDO.setCreator(userId.toString());
|
||||
}
|
||||
// 当前登录用户不为空，更新人为空，则当前登录用户为更新人
|
||||
if (Objects.nonNull(userId) && Objects.isNull(baseDO.getUpdater())) {
|
||||
baseDO.setUpdater(userId.toString());
|
||||
}
|
||||
|
||||
Timestamp time=new Timestamp(System.currentTimeMillis());
|
||||
if (metaObject.hasSetter("createTime")) {
|
||||
this.setFieldValByName("createTime", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("updateTime")) {
|
||||
this.setFieldValByName("updateTime", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("createDate")) {
|
||||
this.setFieldValByName("createDate", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("updateDate")) {
|
||||
this.setFieldValByName("updateDate", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("delFlag")) {
|
||||
this.setFieldValByName("delFlag", false, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("isDel")) {
|
||||
this.setFieldValByName("isDel", 0, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("addTime")) {
|
||||
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
|
||||
this.setFieldValByName("addTime", Integer.valueOf(timestamp), metaObject);
|
||||
}
|
||||
Long userId = WebFrameworkUtils.getLoginUserId();
|
||||
// 当前登录用户不为空，创建人为空，则当前登录用户为创建人
|
||||
if (metaObject.hasSetter("creator")) {
|
||||
this.setFieldValByName("creator", userId.toString(), metaObject);
|
||||
}
|
||||
|
||||
if (metaObject.hasSetter("updater")) {
|
||||
this.setFieldValByName("updater", userId.toString(), metaObject);
|
||||
}
|
||||
|
||||
Timestamp time=new Timestamp(System.currentTimeMillis());
|
||||
if (metaObject.hasSetter("createTime")) {
|
||||
this.setFieldValByName("createTime", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("updateTime")) {
|
||||
this.setFieldValByName("updateTime", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("createDate")) {
|
||||
this.setFieldValByName("createDate", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("updateDate")) {
|
||||
this.setFieldValByName("updateDate", time, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("delFlag")) {
|
||||
this.setFieldValByName("delFlag", false, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("isDel")) {
|
||||
this.setFieldValByName("isDel", 0, metaObject);
|
||||
}
|
||||
if (metaObject.hasSetter("addTime")) {
|
||||
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
|
||||
this.setFieldValByName("addTime", Integer.valueOf(timestamp), metaObject);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user