同步到1.8.0

This commit is contained in:
Jerry
2021-08-14 08:47:19 +08:00
parent 49ffcab84d
commit 8658e0ea5a
243 changed files with 2962 additions and 2159 deletions

View File

@@ -38,9 +38,7 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
@@ -79,23 +77,20 @@
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -182,6 +177,10 @@
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

View File

@@ -97,9 +97,9 @@
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>tk.mybatis</groupId>
<artifactId>mapper-spring-boot-starter</artifactId>
<version>${mybatis-mapper.version}</version>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatisplus.version}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>

View File

@@ -1,16 +0,0 @@
package com.orange.demo.common.core.annotation;
import java.lang.annotation.*;
/**
* 主要用于标记逻辑删除字段。
*
* @author Jerry
* @date 2020-08-08
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DeletedFlagColumn {
}

View File

@@ -36,13 +36,13 @@ public class DataSourceAspect {
Class<?> clazz = point.getTarget().getClass();
MyDataSource ds = clazz.getAnnotation(MyDataSource.class);
// 通过判断 DataSource 中的值来判断当前方法应用哪个数据源
DataSourceContextHolder.setDataSourceType(ds.value());
Integer originalType = DataSourceContextHolder.setDataSourceType(ds.value());
log.debug("set datasource is " + ds.value());
try {
return point.proceed();
} finally {
DataSourceContextHolder.clear();
log.debug("clean datasource");
DataSourceContextHolder.unset(originalType);
log.debug("unset datasource is " + originalType);
}
}
}

View File

@@ -50,13 +50,13 @@ public class DataSourceResolveAspect {
}
int type = resolver.resolve(dsr.arg(), point.getArgs());
// 通过判断 DataSource 中的值来判断当前方法应用哪个数据源
DataSourceContextHolder.setDataSourceType(type);
Integer originalType = DataSourceContextHolder.setDataSourceType(type);
log.debug("set datasource is " + type);
try {
return point.proceed();
} finally {
DataSourceContextHolder.clear();
log.debug("clean datasource");
DataSourceContextHolder.unset(originalType);
log.debug("unset datasource is " + originalType);
}
}
}

View File

@@ -10,6 +10,8 @@ import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.io.Serializable;
/**
* 字典缓存同步的AOP。该AOP的优先级必须比事务切面的优先级高因此会在事务外执行该切面的代码。
*
@@ -39,23 +41,23 @@ public class DictCacheSyncAspect {
Object arg = joinPoint.getArgs()[0];
if ("saveNew".equals(methodName)) {
Object data = joinPoint.proceed();
BaseDictService<Object, Object> service =
(BaseDictService<Object, Object>) joinPoint.getTarget();
BaseDictService<Object, Serializable> service =
(BaseDictService<Object, Serializable>) joinPoint.getTarget();
// 这里参数必须使用saveNew方法的返回对象因为里面包含实际主键值。
service.putDictionaryCache(data);
return data;
} else if ("update".equals(methodName)) {
Object data = joinPoint.proceed();
BaseDictService<Object, Object> service =
(BaseDictService<Object, Object>) joinPoint.getTarget();
BaseDictService<Object, Serializable> service =
(BaseDictService<Object, Serializable>) joinPoint.getTarget();
// update的方法返回的是boolean因此这里的参数需要使用第一个参数即可。
service.putDictionaryCache(arg);
return data;
} else {
// remove
BaseDictService<Object, Object> service =
(BaseDictService<Object, Object>) joinPoint.getTarget();
service.removeDictionaryCache(arg);
BaseDictService<Object, Serializable> service =
(BaseDictService<Object, Serializable>) joinPoint.getTarget();
service.removeDictionaryCache((Serializable) arg);
return joinPoint.proceed();
}
}

View File

@@ -2,6 +2,7 @@ package com.orange.demo.common.core.base.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ReflectUtil;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.constant.AggregationKind;
@@ -18,7 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.Id;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.util.LinkedList;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
* @date 2020-08-08
*/
@Slf4j
public abstract class BaseController<M, V, K> {
public abstract class BaseController<M, V, K extends Serializable> {
/**
* 当前Service关联的主Model实体对象的Class。
@@ -68,7 +69,7 @@ public abstract class BaseController<M, V, K> {
domainVoClass = (Class<V>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
if (null != field.getAnnotation(Id.class)) {
if (null != field.getAnnotation(TableId.class)) {
idFieldName = field.getName();
break;
}

View File

@@ -1,10 +1,8 @@
package com.orange.demo.common.core.base.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import tk.mybatis.mapper.additional.insert.InsertListMapper;
import tk.mybatis.mapper.annotation.RegisterMapper;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
import java.util.Map;
@@ -16,8 +14,7 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
@RegisterMapper
public interface BaseDaoMapper<M> extends Mapper<M>, InsertListMapper<M> {
public interface BaseDaoMapper<M> extends BaseMapper<M> {
/**
* 根据指定的表名、显示字段列表、过滤条件字符串和分组字段,返回聚合计算后的查询结果。

View File

@@ -1,8 +1,8 @@
package com.orange.demo.common.core.base.model;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
@@ -17,24 +17,24 @@ public class BaseModel {
/**
* 创建者Id。
*/
@Column(name = "create_user_id")
@TableField(value = "create_user_id")
private Long createUserId;
/**
* 创建时间。
*/
@Column(name = "create_time")
@TableField(value = "create_time")
private Date createTime;
/**
* 更新者Id。
*/
@Column(name = "update_user_id")
@TableField(value = "update_user_id")
private Long updateUserId;
/**
* 更新时间。
*/
@Column(name = "update_time")
@TableField(value = "update_time")
private Date updateTime;
}

View File

@@ -1,6 +1,7 @@
package com.orange.demo.common.core.base.service;
import cn.hutool.core.util.ReflectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.orange.demo.common.core.constant.GlobalDeletedFlag;
import com.orange.demo.common.core.exception.MyRuntimeException;
import com.orange.demo.common.core.cache.DictionaryCache;
@@ -8,8 +9,8 @@ import com.orange.demo.common.core.object.TokenData;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import java.io.Serializable;
import java.util.*;
/**
@@ -22,7 +23,7 @@ import java.util.*;
* @date 2020-08-08
*/
@Slf4j
public abstract class BaseDictService<M, K> extends BaseService<M, K> implements IBaseDictService<M, K> {
public abstract class BaseDictService<M, K extends Serializable> extends BaseService<M, K> implements IBaseDictService<M, K> {
/**
* 缓存池对象。
@@ -89,15 +90,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
if (tenantIdField != null) {
ReflectUtil.setFieldValue(data, tenantIdField, TokenData.takeFromRequest().getTenantId());
}
if (deletedFlagFieldName != null) {
try {
setDeletedFlagMethod.invoke(data, GlobalDeletedFlag.NORMAL);
} catch (Exception e) {
log.error("Failed to call reflection [setDeletedFlagMethod] in BaseDictService.update.", e);
throw new MyRuntimeException(e);
}
}
return mapper().updateByPrimaryKey(data) == 1;
return mapper().updateById(data) == 1;
}
/**
@@ -109,7 +102,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
@Transactional(rollbackFor = Exception.class)
@Override
public boolean remove(K id) {
return this.removeById(id);
return mapper().deleteById(id) == 1;
}
/**
@@ -118,15 +111,16 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
* @param id 主键Id。
* @return 主键关联的数据不存在返回null。
*/
@SuppressWarnings("unchecked")
@Override
public M getById(K id) {
M data = dictionaryCache.get(id);
public M getById(Serializable id) {
M data = dictionaryCache.get((K) id);
if (data != null) {
return data;
}
data = super.getById(id);
if (data != null) {
this.dictionaryCache.put(id, data);
this.dictionaryCache.put((K) id, data);
}
return data;
}
@@ -188,7 +182,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
}
/**
* 返回符合 inFilterField in (inFilterValues) 条件的所有数据。蜀国property是主键则从缓存中读取。
* 返回符合 inFilterField in (inFilterValues) 条件的所有数据。属性property是主键则从缓存中读取。
*
* @param inFilterField 参与(In-list)过滤的Java对象字段。
* @param inFilterValues 参与(In-list)过滤的Java字段值集合。
@@ -200,7 +194,7 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
if (inFilterField.equals(this.idFieldName)) {
return this.getInList((Set<K>) inFilterValues);
}
return this.getInList(inFilterField, inFilterValues);
return super.getInList(inFilterField, inFilterValues);
}
/**
@@ -220,8 +214,10 @@ public abstract class BaseDictService<M, K> extends BaseService<M, K> implements
List<M> dataList = this.getInList((Set<K>) inFilterValues);
return dataList.size() == inFilterValues.size();
}
Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, null);
return mapper().selectCountByExample(e) == inFilterValues.size();
String columnName = this.safeMapToColumnName(inFilterField);
QueryWrapper<M> queryWrapper = new QueryWrapper<>();
queryWrapper.in(columnName, inFilterValues);
return mapper().selectCount(queryWrapper) == inFilterValues.size();
}
/**

View File

@@ -1,5 +1,10 @@
package com.orange.demo.common.core.base.service;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.hutool.core.util.ReflectUtil;
import com.alibaba.fastjson.JSONObject;
import com.orange.demo.common.core.annotation.*;
@@ -8,6 +13,7 @@ import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.constant.AggregationKind;
import com.orange.demo.common.core.constant.AggregationType;
import com.orange.demo.common.core.constant.GlobalDeletedFlag;
import com.orange.demo.common.core.exception.InvalidDataFieldException;
import com.orange.demo.common.core.exception.MyRuntimeException;
import com.orange.demo.common.core.exception.RemoteDataBuildException;
import com.orange.demo.common.core.object.*;
@@ -21,12 +27,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.lang.reflect.Modifier;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -45,7 +47,7 @@ import static java.util.stream.Collectors.*;
* @date 2020-08-08
*/
@Slf4j
public abstract class BaseService<M, K> implements IBaseService<M, K> {
public abstract class BaseService<M, K extends Serializable> extends ServiceImpl<BaseDaoMapper<M>, M> implements IBaseService<M, K> {
/**
* 当前Service关联的主Model实体对象的Class。
*/
@@ -154,6 +156,11 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
private static final String AND_OP = " AND ";
@Override
public BaseDaoMapper<M> getBaseMapper() {
return mapper();
}
/**
* 构造函数在实例化的时候一次性完成所有有关主Model对象信息的加载。
*/
@@ -161,7 +168,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
public BaseService() {
modelClass = (Class<M>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
idFieldClass = (Class<K>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
this.tableName = modelClass.getAnnotation(Table.class).name();
this.tableName = modelClass.getAnnotation(TableName.class).value();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
initializeField(field);
@@ -169,10 +176,10 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
}
private void initializeField(Field field) {
if (idFieldName == null && null != field.getAnnotation(Id.class)) {
if (idFieldName == null && null != field.getAnnotation(TableId.class)) {
idFieldName = field.getName();
Column c = field.getAnnotation(Column.class);
idColumnName = c == null ? idFieldName : c.name();
TableId c = field.getAnnotation(TableId.class);
idColumnName = c == null ? idFieldName : c.value();
setIdFieldMethod = ReflectUtil.getMethod(
modelClass, "set" + StringUtils.capitalize(idFieldName), idFieldClass);
getIdFieldMethod = ReflectUtil.getMethod(
@@ -180,21 +187,18 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
}
if (updateTimeFieldName == null && null != field.getAnnotation(JobUpdateTimeColumn.class)) {
updateTimeFieldName = field.getName();
Column c = field.getAnnotation(Column.class);
updateTimeColumnName = c == null ? updateTimeFieldName : c.name();
updateTimeColumnName = this.safeMapToColumnName(updateTimeFieldName);
}
if (deletedFlagFieldName == null && null != field.getAnnotation(DeletedFlagColumn.class)) {
if (deletedFlagFieldName == null && null != field.getAnnotation(TableLogic.class)) {
deletedFlagFieldName = field.getName();
Column c = field.getAnnotation(Column.class);
deletedFlagColumnName = c == null ? deletedFlagFieldName : c.name();
deletedFlagColumnName = this.safeMapToColumnName(deletedFlagFieldName);
setDeletedFlagMethod = ReflectUtil.getMethod(
modelClass, "set" + StringUtils.capitalize(deletedFlagFieldName), Integer.class);
}
if (tenantIdFieldName == null && null != field.getAnnotation(TenantFilterColumn.class)) {
tenantIdField = field;
tenantIdFieldName = field.getName();
Column c = field.getAnnotation(Column.class);
tenantIdColumnName = c == null ? tenantIdFieldName : c.name();
tenantIdColumnName = this.safeMapToColumnName(tenantIdFieldName);
}
}
@@ -217,31 +221,6 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
return false;
}
/**
* 基于主键Id删除数据。如果包含逻辑删除字段则进行逻辑删除。
*
* @param id 主键Id值。
* @return true删除成功false数据不存在。
*/
@Transactional(rollbackFor = Exception.class)
@Override
public boolean removeById(K id) {
if (this.deletedFlagFieldName == null) {
return mapper().deleteByPrimaryKey(id) == 1;
}
try {
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria().andEqualTo(idFieldName, id);
c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
M data = modelClass.newInstance();
setDeletedFlagMethod.invoke(data, GlobalDeletedFlag.DELETED);
return mapper().updateByExampleSelective(data, e) == 1;
} catch (Exception ex) {
log.error("Failed to call reflection method in BaseService.removeById.", ex);
throw new MyRuntimeException(ex);
}
}
/**
* 根据过滤条件删除数据。
*
@@ -251,25 +230,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
@Transactional(rollbackFor = Exception.class)
@Override
public Integer removeBy(M filter) {
if (deletedFlagFieldName == null) {
return mapper().delete(filter);
}
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
if (field.getAnnotation(Transient.class) == null) {
this.assembleCriteriaByFilter(filter, field, c);
}
}
try {
M deletedObject = modelClass.newInstance();
this.setDeletedFlagMethod.invoke(deletedObject, GlobalDeletedFlag.DELETED);
return mapper().updateByExampleSelective(deletedObject, e);
} catch (Exception ex) {
log.error("Failed to call reflection method in BaseService.removeBy.", ex);
throw new MyRuntimeException(ex);
}
return mapper().delete(new QueryWrapper<>(filter));
}
/**
@@ -297,27 +258,8 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (fieldName.equals(this.idFieldName)) {
return this.existId((K) fieldValue);
}
Example e = new Example(modelClass);
e.createCriteria().andEqualTo(fieldName, fieldValue);
return mapper().selectCountByExample(e) == 1;
}
/**
* 获取主键Id关联的数据。
*
* @param id 主键Id
* @return 主键关联的数据不存在返回null。
*/
@Override
public M getById(K id) {
if (deletedFlagFieldName == null) {
return mapper().selectByPrimaryKey(id);
}
Example e = new Example(modelClass);
e.createCriteria()
.andEqualTo(idFieldName, id)
.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
return mapper().selectOneByExample(e);
String columnName = MyModelUtil.mapToColumnName(fieldName, modelClass);
return mapper().selectCount(new QueryWrapper<M>().eq(columnName, fieldValue)) == 1;
}
/**
@@ -333,12 +275,9 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (filterField.equals(idFieldName)) {
return this.getById((K) filterValue);
}
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria().andEqualTo(filterField, filterValue);
if (deletedFlagFieldName != null) {
c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
}
return mapper().selectOneByExample(e);
String columnName = this.safeMapToColumnName(filterField);
QueryWrapper<M> queryWrapper = new QueryWrapper<M>().eq(columnName, filterValue);
return mapper().selectOne(queryWrapper);
}
/**
@@ -363,12 +302,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public List<M> getAllList() {
if (deletedFlagFieldName == null) {
return mapper().selectAll();
}
Example e = new Example(modelClass);
e.createCriteria().andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
return mapper().selectByExample(e);
return mapper().selectList(Wrappers.emptyWrapper());
}
/**
@@ -379,14 +313,11 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public List<M> getAllListByOrder(String... orderByProperties) {
Example e = new Example(modelClass);
for (String orderByProperty : orderByProperties) {
e.orderBy(orderByProperty);
String[] columns = new String[orderByProperties.length];
for (int i = 0; i < orderByProperties.length; i++) {
columns[i] = this.safeMapToColumnName(orderByProperties[i]);
}
if (deletedFlagFieldName != null) {
e.and().andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
}
return mapper().selectByExample(e);
return mapper().selectList(new QueryWrapper<M>().orderByAsc(columns));
}
/**
@@ -415,8 +346,8 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (CollectionUtils.isEmpty(inFilterValues)) {
return true;
}
Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, null);
return mapper().selectCountByExample(e) == inFilterValues.size();
String column = this.safeMapToColumnName(inFilterField);
return mapper().selectCount(new QueryWrapper<M>().in(column, inFilterValues)) == inFilterValues.size();
}
/**
@@ -455,8 +386,12 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (CollectionUtils.isEmpty(inFilterValues)) {
return new LinkedList<>();
}
Example e = this.makeDefaultInListExample(inFilterField, inFilterValues, orderBy);
return mapper().selectByExample(e);
String column = this.safeMapToColumnName(inFilterField);
QueryWrapper<M> queryWrapper = new QueryWrapper<M>().in(column, inFilterValues);
if (StringUtils.isNotBlank(orderBy)) {
queryWrapper.last(orderBy);
}
return mapper().selectList(queryWrapper);
}
/**
@@ -467,16 +402,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public int getCountByFilter(M filter) {
if (deletedFlagFieldName == null) {
return mapper().selectCount(filter);
}
try {
setDeletedFlagMethod.invoke(filter, GlobalDeletedFlag.NORMAL);
return mapper().selectCount(filter);
} catch (Exception e) {
log.error("Failed to call reflection [setDeletedFlagMethod] in BaseService.getCountByFilter.", e);
throw new MyRuntimeException(e);
}
return mapper().selectCount(new QueryWrapper<>(filter));
}
/**
@@ -498,42 +424,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public List<M> getListByFilter(M filter) {
if (filter == null) {
return this.getAllList();
}
if (deletedFlagFieldName == null) {
return mapper().select(filter);
}
try {
setDeletedFlagMethod.invoke(filter, GlobalDeletedFlag.NORMAL);
return mapper().select(filter);
} catch (Exception ex) {
log.error("Failed to call reflection code of BaseService.getListByFilter.", ex);
throw new MyRuntimeException(ex);
}
}
private void assembleCriteriaByFilter(M filter, Field field, Example.Criteria c) {
int modifiers = field.getModifiers();
// transient类型的字段不能作为查询条件
int transientMask = 128;
if ((modifiers & transientMask) != 0 || Modifier.isStatic(modifiers)) {
return;
}
if (field.getName().equals(deletedFlagFieldName)) {
c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
} else {
ReflectUtil.setAccessible(field);
try {
Object o = field.get(filter);
if (o != null) {
c.andEqualTo(field.getName(), field.get(filter));
}
} catch (IllegalAccessException ex) {
log.error("Failed to call reflection code of BaseService.getListByFilter.", ex);
throw new MyRuntimeException(ex);
}
}
return mapper().selectList(new QueryWrapper<>(filter));
}
/**
@@ -545,17 +436,14 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public List<M> getListByParentId(String parentIdFieldName, K parentId) {
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria();
QueryWrapper<M> queryWrapper = new QueryWrapper<>();
String parentIdColumn = this.safeMapToColumnName(parentIdFieldName);
if (parentId != null) {
c.andEqualTo(parentIdFieldName, parentId);
queryWrapper.eq(parentIdColumn, parentId);
} else {
c.andIsNull(parentIdFieldName);
queryWrapper.isNull(parentIdColumn);
}
if (deletedFlagFieldName != null) {
c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
}
return mapper().selectByExample(e);
return mapper().selectList(queryWrapper);
}
/**
@@ -585,32 +473,21 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
*/
@Override
public List<M> getListByCondition(List<String> selectList, M filter, String whereClause, String orderBy) {
Example e = new Example(modelClass);
Example.Criteria c = null;
QueryWrapper<M> queryWrapper = new QueryWrapper<>(filter);
if (CollectionUtils.isNotEmpty(selectList)) {
String[] selectFields = new String[selectList.size()];
selectList.toArray(selectFields);
e.selectProperties(selectFields);
}
if (StringUtils.isNotBlank(orderBy)) {
e.setOrderByClause(orderBy);
}
if (filter != null) {
c = e.createCriteria();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
if (field.getAnnotation(Transient.class) == null) {
this.assembleCriteriaByFilter(filter, field, c);
}
String[] columns = new String[selectList.size()];
for (int i = 0; i < selectList.size(); i++) {
columns[i] = this.safeMapToColumnName(selectList.get(i));
}
queryWrapper.select(columns);
}
if (StringUtils.isNotBlank(whereClause)) {
if (c == null) {
c = e.createCriteria();
}
c.andCondition(whereClause);
queryWrapper.apply(whereClause);
}
return mapper().selectByExample(e);
if (StringUtils.isNotBlank(orderBy)) {
queryWrapper.last(" ORDER BY " + orderBy);
}
return mapper().selectList(queryWrapper);
}
/**
@@ -909,9 +786,10 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
continue;
}
Object masterIdValue = ReflectUtil.getFieldValue(dataObject, relationStruct.masterIdField);
Example e = new Example(relationStruct.relationManyToMany.relationModelClass());
e.createCriteria().andEqualTo(relationStruct.masterIdField.getName(), masterIdValue);
List<?> manyToManyList = relationStruct.manyToManyMapper.selectByExample(e);
String masterIdColumn = this.safeMapToColumnName(relationStruct.masterIdField.getName());
Map<String, Object> filterMap = new HashMap<>(1);
filterMap.put(masterIdColumn, masterIdValue);
List<?> manyToManyList = relationStruct.manyToManyMapper.selectByMap(filterMap);
ReflectUtil.setFieldValue(dataObject, relationStruct.relationField, manyToManyList);
}
}
@@ -1302,7 +1180,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (CollectionUtils.isEmpty(masterIdSet)) {
continue;
}
BaseService<Object, Object> relationService = relationStruct.localService;
BaseService<Object, Serializable> relationService = relationStruct.localService;
List<Object> relationList =
relationService.getInList(relationStruct.relationOneToOne.slaveIdField(), masterIdSet);
MyModelUtil.makeOneToOneRelation(
@@ -1311,8 +1189,8 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
if (withDict && relationStruct.relationOneToOne.loadSlaveDict()
&& CollectionUtils.isNotEmpty(relationList)) {
@SuppressWarnings("unchecked")
BaseService<Object, Object> proxyTarget =
(BaseService<Object, Object>) AopTargetUtil.getTarget(relationService);
BaseService<Object, Serializable> proxyTarget =
(BaseService<Object, Serializable>) AopTargetUtil.getTarget(relationService);
// 关联常量字典
proxyTarget.buildConstDictForDataList(relationList, ignoreFields);
// 关联本地字典。
@@ -1341,14 +1219,14 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
}
Object id = ReflectUtil.getFieldValue(dataObject, relationStruct.masterIdField);
if (id != null) {
BaseService<Object, Object> relationService = relationStruct.localService;
BaseService<Object, Serializable> relationService = relationStruct.localService;
Object relationObject = relationService.getOne(relationStruct.relationOneToOne.slaveIdField(), id);
ReflectUtil.setFieldValue(dataObject, relationStruct.relationField, relationObject);
// 仅仅当需要加载从表字典关联时,才去加载。
if (withDict && relationStruct.relationOneToOne.loadSlaveDict() && relationObject != null) {
@SuppressWarnings("unchecked")
BaseService<Object, Object> proxyTarget =
(BaseService<Object, Object>) AopTargetUtil.getTarget(relationService);
BaseService<Object, Serializable> proxyTarget =
(BaseService<Object, Serializable>) AopTargetUtil.getTarget(relationService);
// 关联常量字典
proxyTarget.buildConstDictForData(relationObject, ignoreFields);
// 关联本地字典。
@@ -1380,7 +1258,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
.collect(toSet());
// 从主表集合中抽取主表关联字段的集合再以in list形式去从表中查询。
if (CollectionUtils.isNotEmpty(masterIdSet)) {
BaseService<Object, Object> relationService = relationStruct.localService;
BaseService<Object, Serializable> relationService = relationStruct.localService;
List<Object> relationList =
relationService.getInList(relationStruct.relationOneToMany.slaveIdField(), masterIdSet);
MyModelUtil.makeOneToManyRelation(
@@ -1405,7 +1283,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
}
Object id = ReflectUtil.getFieldValue(dataObject, relationStruct.masterIdField);
if (id != null) {
BaseService<Object, Object> relationService = relationStruct.localService;
BaseService<Object, Serializable> relationService = relationStruct.localService;
Set<Object> masterIdSet = new HashSet<>(1);
masterIdSet.add(id);
List<Object> relationObject = relationService.getInList(
@@ -1780,32 +1658,97 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
}
/**
* 通过(In-list)条件和orderBy条件构建Example对象以供后续的查询操作使用。
* 因为Mybatis Plus中QueryWrapper的条件方法都要求传入数据表字段名因此提供该函数将
* Java实体对象的字段名转换为数据表字段名如果不存在会抛出异常。
* 另外在MyModelUtil.mapToColumnName有一级缓存对于查询过的对象字段都会放到缓存中
* 下次映射转换的时候,会直接从缓存获取。
*
* @param inFilterField 参与(In-list)过滤的Java字段。
* @param inFilterValues 参与(In-list)过滤的字段值集合
* @param orderBy 排序字段。
* @param <T> in 属性字段的类型。
* @return 构建后的Example对象。
* @param fieldName Java实体对象的字段
* @return 对应的数据表字段名
*/
protected <T> Example makeDefaultInListExample(String inFilterField, Collection<T> inFilterValues, String orderBy) {
Set<T> inFilterValueSet;
Example e = new Example(modelClass);
if (StringUtils.isNotBlank(orderBy)) {
e.setOrderByClause(orderBy);
protected String safeMapToColumnName(String fieldName) {
String columnName = MyModelUtil.mapToColumnName(fieldName, modelClass);
if (columnName == null) {
throw new InvalidDataFieldException(modelClass.getSimpleName(), fieldName);
}
if (inFilterValues instanceof Set) {
inFilterValueSet = (Set<T>) inFilterValues;
} else {
inFilterValueSet = new HashSet<>(inFilterValues.size());
inFilterValueSet.addAll(inFilterValues);
return columnName;
}
/**
* 因为Mybatis Plus在update的时候不能将实体对象中值为null的字段更新为null
* 而且忽略更新,在全部更新场景下,这个是非常重要的,所以我们写了这个函数绕开这一问题。
* 该函数会遍历实体对象中,所有不包含@Transient注解没有transient修饰符的字段如果
* 当前对象的该字段值为null则会调用UpdateWrapper的set方法将该字段赋值为null。
* 相比于其他重载方法该方法会将参数中的主键id设置到UpdateWrapper的过滤条件中。
*
* @param o 实体对象。
* @param id 实体对象的主键值。
* @return 创建后的UpdateWrapper。
*/
protected UpdateWrapper<M> createUpdateQueryForNullValue(M o, K id) {
UpdateWrapper<M> uw = createUpdateQueryForNullValue(o, modelClass);
try {
M filter = modelClass.newInstance();
this.setIdFieldMethod.invoke(filter, id);
uw.setEntity(filter);
} catch (Exception e) {
log.error("Failed to call reflection code of BaseService.createUpdateQueryForNullValue.", e);
throw new MyRuntimeException(e);
}
Example.Criteria c = e.createCriteria();
c.andIn(inFilterField, inFilterValueSet);
if (deletedFlagFieldName != null) {
c.andEqualTo(deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
return uw;
}
/**
* 因为Mybatis Plus在update的时候不能将实体对象中值为null的字段更新为null
* 而且忽略更新,在全部更新场景下,这个是非常重要的,所以我们写了这个函数绕开这一问题。
* 该函数会遍历实体对象中,所有不包含@Transient注解没有transient修饰符的字段如果
* 当前对象的该字段值为null则会调用UpdateWrapper的set方法将该字段赋值为null。
*
* @param o 实体对象。
* @return 创建后的UpdateWrapper。
*/
protected UpdateWrapper<M> createUpdateQueryForNullValue(M o) {
return createUpdateQueryForNullValue(o, modelClass);
}
/**
* 因为Mybatis Plus在update的时候不能将实体对象中值为null的字段更新为null
* 而且忽略更新,在全部更新场景下,这个是非常重要的,所以我们写了这个函数绕开这一问题。
* 该函数会遍历实体对象中,所有不包含@Transient注解没有transient修饰符的字段如果
* 当前对象的该字段值为null则会调用UpdateWrapper的set方法将该字段赋值为null。
*
* @param o 实体对象。
* @param clazz 实体对象的class。
* @return 创建后的UpdateWrapper。
*/
public static <T> UpdateWrapper<T> createUpdateQueryForNullValue(T o, Class<T> clazz) {
UpdateWrapper<T> uw = new UpdateWrapper<>();
Field[] fields = ReflectUtil.getFields(clazz);
List<String> nullColumnList = new LinkedList<>();
for (Field field : fields) {
TableField tableField = field.getAnnotation(TableField.class);
if (tableField == null || tableField.exist()) {
int modifiers = field.getModifiers();
// transient类型的字段不能作为查询条件静态字段和逻辑删除都不考虑。
int transientMask = 128;
if ((modifiers & transientMask) == 1
|| Modifier.isStatic(modifiers)
|| field.getAnnotation(TableLogic.class) != null) {
continue;
}
// 仅当实体对象参数中当前字段值为null的时候才会赋值给UpdateWrapper。
// 以便在后续的更新中可以将这些null字段的值设置到数据库表对应的字段中。
if (ReflectUtil.getFieldValue(o, field) == null) {
nullColumnList.add(MyModelUtil.safeMapToColumnName(field.getName(), clazz));
}
}
}
return e;
if (CollectionUtils.isNotEmpty(nullColumnList)) {
for (String nullColumn : nullColumnList) {
uw.set(nullColumn, null);
}
}
return uw;
}
@SuppressWarnings("unchecked")
@@ -1895,7 +1838,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
relationStruct.localService = ApplicationContextHolder.getBean(
StringUtils.uncapitalize(relationOneToOne.slaveServiceName()));
} else {
relationStruct.localService = (BaseService<Object, Object>)
relationStruct.localService = (BaseService<Object, Serializable>)
ApplicationContextHolder.getBean(relationOneToOne.slaveServiceClass());
}
localRelationOneToOneStructList.add(relationStruct);
@@ -1911,7 +1854,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
relationStruct.localService = ApplicationContextHolder.getBean(
StringUtils.uncapitalize(relationOneToMany.slaveServiceName()));
} else {
relationStruct.localService = (BaseService<Object, Object>)
relationStruct.localService = (BaseService<Object, Serializable>)
ApplicationContextHolder.getBean(relationOneToMany.slaveServiceClass());
}
localRelationOneToManyStructList.add(relationStruct);
@@ -1958,7 +1901,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
relationStruct.localService =
ApplicationContextHolder.getBean(StringUtils.uncapitalize(relationDict.slaveServiceName()));
} else {
relationStruct.localService = (BaseService<Object, Object>)
relationStruct.localService = (BaseService<Object, Serializable>)
ApplicationContextHolder.getBean(relationDict.slaveServiceClass());
}
localRelationDictStructList.add(relationStruct);
@@ -1980,7 +1923,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
relationStruct.localService = ApplicationContextHolder.getBean(
StringUtils.uncapitalize(relationOneToManyAggregation.slaveServiceName()));
} else {
relationStruct.localService = (BaseService<Object, Object>)
relationStruct.localService = (BaseService<Object, Serializable>)
ApplicationContextHolder.getBean(relationOneToManyAggregation.slaveServiceClass());
}
localRelationOneToManyAggrStructList.add(relationStruct);
@@ -1999,7 +1942,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
relationStruct.localService = ApplicationContextHolder.getBean(
StringUtils.uncapitalize(relationManyToManyAggregation.slaveServiceName()));
} else {
relationStruct.localService = (BaseService<Object, Object>)
relationStruct.localService = (BaseService<Object, Serializable>)
ApplicationContextHolder.getBean(relationManyToManyAggregation.slaveServiceClass());
}
localRelationManyToManyAggrStructList.add(relationStruct);
@@ -2392,7 +2335,7 @@ public abstract class BaseService<M, K> implements IBaseService<M, K> {
static class LocalRelationStruct extends RelationStruct {
private Field equalOneToOneRelationField;
private BaseService<Object, Object> localService;
private BaseService<Object, Serializable> localService;
private BaseDaoMapper<Object> manyToManyMapper;
private Map<Object, String> dictMap;
private RelationDict relationDict;

View File

@@ -1,5 +1,6 @@
package com.orange.demo.common.core.base.service;
import java.io.Serializable;
import java.util.List;
/**
@@ -10,7 +11,7 @@ import java.util.List;
* @author Jerry
* @date 2020-08-08
*/
public interface IBaseDictService<M, K> extends IBaseService<M, K> {
public interface IBaseDictService<M, K extends Serializable> extends IBaseService<M, K> {
/**
* 重新加载数据库中所有当前表数据到系统内存。

View File

@@ -1,7 +1,9 @@
package com.orange.demo.common.core.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.orange.demo.common.core.object.MyRelationParam;
import java.io.Serializable;
import java.util.*;
/**
@@ -12,15 +14,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
public interface IBaseService<M, K> {
/**
* 基于主键Id删除数据。如果包含逻辑删除字段则进行逻辑删除。
*
* @param id 主键Id值。
* @return true删除成功false数据不存在。
*/
boolean removeById(K id);
public interface IBaseService<M, K extends Serializable> extends IService<M>{
/**
* 根据过滤条件删除数据。
@@ -48,14 +42,6 @@ public interface IBaseService<M, K> {
*/
boolean existId(K id);
/**
* 获取主键Id关联的数据。
*
* @param id 主键Id。
* @return 主键关联的数据不存在返回null。
*/
M getById(K id);
/**
* 返回符合 filterField = filterValue 条件的一条数据。
*

View File

@@ -11,15 +11,20 @@ public class DataSourceContextHolder {
private static final ThreadLocal<Integer> CONTEXT_HOLDER = new ThreadLocal<>();
/**
* 设置数据源类型
* 设置数据源类型
*
* @param type 数据源类型
* @return 原有数据源类型如果第一次设置则返回null。
*/
public static void setDataSourceType(Integer type) {
public static Integer setDataSourceType(Integer type) {
Integer datasourceType = CONTEXT_HOLDER.get();
CONTEXT_HOLDER.set(type);
return datasourceType;
}
/**
* 获取当前数据库操作执行线程的数据源类型,同时由动态数据源的路由函数调用。
*
* @return 数据源类型。
*/
public static Integer getDataSourceType() {
@@ -27,10 +32,16 @@ public class DataSourceContextHolder {
}
/**
* 清除线程本地变量,以免内存泄漏
* 清除线程本地变量,以免内存泄漏
* @param originalType 原有的数据源类型如果该值为null则情况本地化变量。
*/
public static void clear() {
CONTEXT_HOLDER.remove();
public static void unset(Integer originalType) {
if (originalType == null) {
CONTEXT_HOLDER.remove();
} else {
CONTEXT_HOLDER.set(originalType);
}
}
/**

View File

@@ -34,11 +34,11 @@ public final class AggregationType {
private static final Map<Object, String> DICT_MAP = new HashMap<>(5);
static {
DICT_MAP.put(0, "累计总和");
DICT_MAP.put(1, "数量总和");
DICT_MAP.put(2, "平均值");
DICT_MAP.put(3, "最小值");
DICT_MAP.put(4, "最大值");
DICT_MAP.put(SUM, "累计总和");
DICT_MAP.put(COUNT, "数量总和");
DICT_MAP.put(AVG, "平均值");
DICT_MAP.put(MIN, "最小值");
DICT_MAP.put(MAX, "最大值");
}
/**

View File

@@ -6,8 +6,10 @@ import com.orange.demo.common.core.exception.InvalidClassFieldException;
import com.orange.demo.common.core.exception.InvalidDataFieldException;
import com.orange.demo.common.core.exception.InvalidDataModelException;
import com.orange.demo.common.core.util.MyModelUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -227,6 +229,8 @@ public class MyOrderParam extends ArrayList<MyOrderParam.OrderInfo> {
/**
* 排序信息对象。
*/
@AllArgsConstructor
@NoArgsConstructor
@Data
public static class OrderInfo {
/**

View File

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
@@ -21,7 +22,6 @@ import java.util.List;
@Slf4j
@Data
@NoArgsConstructor
@AllArgsConstructor
public class MyWhereCriteria {
/**
@@ -80,11 +80,26 @@ public class MyWhereCriteria {
@JSONField(serialize = false)
private Class<?> modelClazz;
/**
* 数据库表名。
*/
private String tableName;
/**
* Java属性名称。
*/
private String fieldName;
/**
* 数据表字段名。
*/
private String columnName;
/**
* 数据表字段类型。
*/
private Integer columnType;
/**
* 操作符类型,取值范围见上面的常量值。
*/
@@ -95,6 +110,13 @@ public class MyWhereCriteria {
*/
private Object value;
public MyWhereCriteria(Class<?> modelClazz, String fieldName, Integer operatorType, Object value) {
this.modelClazz = modelClazz;
this.fieldName = fieldName;
this.operatorType = operatorType;
this.value = value;
}
/**
* 设置条件值。
*
@@ -127,6 +149,29 @@ public class MyWhereCriteria {
return doVerify();
}
/**
* 设置条件值通过该构造方法设置时通常是直接将表名、字段名、字段类型等赋值无需在通过modelClazz进行推演。
*
* @param tableName 数据表名。
* @param columnName 数据字段名。
* @param columnType 数据字段类型。
* @param operatorType 操作类型。具体值可参考当前对象的静态变量。
* @param value 条件过滤值。
*/
public void setCriteria(
String tableName, String columnName, String columnType, Integer operatorType, Object value) {
this.tableName = tableName;
this.columnName = columnName;
this.columnType = MyModelUtil.NUMERIC_FIELD_TYPE;
if (String.class.getSimpleName().equals(columnType)) {
this.columnType = MyModelUtil.STRING_FIELD_TYPE;
} else if (Date.class.getSimpleName().equals(columnType)) {
this.columnType = MyModelUtil.DATE_FIELD_TYPE;
}
this.operatorType = operatorType;
this.value = value;
}
/**
* 在执行该函数之前,该对象的所有数据均已经赋值完毕。
* 该函数主要验证操作符字段和条件值字段对应关系的合法性。
@@ -182,13 +227,13 @@ public class MyWhereCriteria {
case OPERATOR_NOT_EQUAL:
return " != ";
case OPERATOR_GE:
return " &gt;= ";
return " >= ";
case OPERATOR_GT:
return " &gt; ";
return " > ";
case OPERATOR_LE:
return " &lt;= ";
return " <= ";
case OPERATOR_LT:
return " &lt; ";
return " < ";
case OPERATOR_LIKE:
return " LIKE ";
case OPERATOR_NOT_NULL:
@@ -222,18 +267,26 @@ public class MyWhereCriteria {
* @return 组装后的SQL条件从句。
*/
public String makeCriteriaString(Class<?> modelClazz) {
if (modelClazz == null) {
throw new IllegalArgumentException("ModelClazz argument can't be NULL.");
String tableName;
String columnName;
Integer columnType;
if (modelClazz != null) {
Tuple2<String, Integer> fieldInfo = MyModelUtil.mapToColumnInfo(fieldName, modelClazz);
if (fieldInfo == null) {
throw new InvalidDataFieldException(modelClazz.getSimpleName(), fieldName);
}
columnName = fieldInfo.getFirst();
columnType = fieldInfo.getSecond();
tableName = MyModelUtil.mapToTableName(modelClazz);
if (tableName == null) {
throw new InvalidDataModelException(modelClazz.getSimpleName());
}
} else {
tableName = this.tableName;
columnName = this.columnName;
columnType = this.columnType;
}
Tuple2<String, Integer> fieldInfo = MyModelUtil.mapToColumnInfo(fieldName, modelClazz);
if (fieldInfo == null) {
throw new InvalidDataFieldException(modelClazz.getSimpleName(), fieldName);
}
String tableName = MyModelUtil.mapToTableName(modelClazz);
if (tableName == null) {
throw new InvalidDataModelException(modelClazz.getSimpleName());
}
return this.buildClauseString(tableName, fieldInfo.getFirst(), fieldInfo.getSecond());
return this.buildClauseString(tableName, columnName, columnType);
}
/**

View File

@@ -135,7 +135,7 @@ public class ResponseResult<T> {
}
/**
* 根据参数的errorCode和errorMessage创建新的错误应答对象。
* 根据参数中出错的ResponseResult创建新的错误应答对象。
*
* @param errorCause 导致错误原因的应答对象。
* @return 返回创建的ResponseResult实例对象。
@@ -144,6 +144,16 @@ public class ResponseResult<T> {
return error(errorCause.errorCode, errorCause.getErrorMessage());
}
/**
* 根据参数中出错的CallResult创建新的错误应答对象。
*
* @param errorCause 导致错误原因的应答对象。
* @return 返回创建的ResponseResult实例对象。
*/
public static <T> ResponseResult<T> errorFrom(CallResult errorCause) {
return error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorCause.getErrorMessage());
}
/**
* 是否成功。
*

View File

@@ -63,6 +63,10 @@ public class TokenData {
* 仅当系统支持uaa时可用否则可以直接忽略该字段。保留该字段是为了保持单体和微服务通用代码部分的兼容性。
*/
private String uaaAccessToken;
/**
* 数据库路由键(仅当水平分库时使用)。
*/
private Integer datasourceRouteKey;
/**
* 登录IP。
*/

View File

@@ -2,22 +2,19 @@ package com.orange.demo.common.core.util;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ReflectUtil;
import com.baomidou.mybatisplus.annotation.*;
import com.orange.demo.common.core.exception.InvalidDataFieldException;
import com.orange.demo.common.core.annotation.*;
import com.orange.demo.common.core.exception.MyRuntimeException;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.object.Tuple2;
import com.orange.demo.common.core.upload.UploadStoreInfo;
import com.google.common.base.CaseFormat;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import tk.mybatis.mapper.entity.Example;
import javax.persistence.Column;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.lang.reflect.Modifier;
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -66,6 +63,24 @@ public class MyModelUtil {
*/
private static final Map<String, Tuple2<String, Integer>> CACHED_COLUMNINFO_MAP = new ConcurrentHashMap<>();
/**
* 将bean的数据列表转换为Map列表。
*
* @param dataList bean数据列表。
* @param <T> bean对象类型。
* @return 转换后的Map列表。
*/
public static <T> List<Map<String, Object>> beanToMapList(List<T> dataList) {
if (CollectionUtils.isEmpty(dataList)) {
return null;
}
List<Map<String, Object>> resultList = new LinkedList<>();
for (T data : dataList) {
resultList.add(BeanUtil.beanToMap(data));
}
return resultList;
}
/**
* 拷贝源类型的集合数据到目标类型的集合中,其中源类型和目标类型中的对象字段类型完全相同。
* NOTE: 该函数主要应用于框架中Dto和Model之间的copy特别针对一对一关联的深度copy。
@@ -189,8 +204,20 @@ public class MyModelUtil {
if (field == null) {
return null;
}
Column c = field.getAnnotation(Column.class);
String columnName = c == null ? fieldName : c.name();
TableField c = field.getAnnotation(TableField.class);
String columnName = null;
if (c == null) {
TableId id = field.getAnnotation(TableId.class);
if (id != null) {
columnName = id.value();
}
}
if (columnName == null) {
columnName = c == null ? CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, fieldName) : c.value();
if (StringUtils.isBlank(columnName)) {
columnName = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, fieldName);
}
}
// 这里缺省情况下都是按照整型去处理,因为他覆盖太多的类型了。
// 如Integer/Long/Double/BigDecimal可根据实际情况完善和扩充。
String typeName = field.getType().getSimpleName();
@@ -213,8 +240,8 @@ public class MyModelUtil {
* @return Model对象对应的数据表名称。
*/
public static String mapToTableName(Class<?> modelClazz) {
Table t = modelClazz.getAnnotation(Table.class);
return t == null ? null : t.name();
TableName t = modelClazz.getAnnotation(TableName.class);
return t == null ? null : t.value();
}
/**
@@ -587,43 +614,6 @@ public class MyModelUtil {
return isMap ? BeanUtil.beanToMap(model) : model;
}
/**
* 转换过滤对象到与其等效的Example对象。
*
* @param filterModel 过滤对象。
* @param modelClass 过滤对象的Class对象。
* @param <T> 过滤对象类型。
* @return 转换后的Example对象。
*/
public static <T> Example convertFilterModelToExample(T filterModel, Class<T> modelClass) {
if (filterModel == null) {
return null;
}
Example e = new Example(modelClass);
Example.Criteria c = e.createCriteria();
Field[] fields = ReflectUtil.getFields(modelClass);
for (Field field : fields) {
if (field.getAnnotation(Transient.class) == null) {
int modifiers = field.getModifiers();
// transient类型的字段不能作为查询条件
if ((modifiers & 128) != 0 || Modifier.isStatic(modifiers)) {
continue;
}
ReflectUtil.setAccessible(field);
try {
Object o = field.get(filterModel);
if (o != null) {
c.andEqualTo(field.getName(), field.get(filterModel));
}
} catch (IllegalAccessException ex) {
log.error("Failed to call reflection code.", ex);
throw new MyRuntimeException(ex);
}
}
}
return e;
}
/**
* 获取上传字段的存储信息。
*

View File

@@ -31,7 +31,6 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -65,23 +64,20 @@
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -115,8 +111,6 @@
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -198,6 +192,11 @@
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

View File

@@ -39,6 +39,9 @@ public class RedissonConfig {
@Value("${redis.redisson.timeout}")
private Integer timeout;
@Value("${redis.redisson.password:}")
private String password;
@Value("${redis.redisson.pool.poolSize}")
private Integer poolSize;
@@ -47,10 +50,14 @@ public class RedissonConfig {
@Bean
public RedissonClient redissonClient() {
if (StrUtil.isBlank(password)) {
password = null;
}
Config config = new Config();
if ("single".equals(mode)) {
config.setLockWatchdogTimeout(lockWatchdogTimeout)
.useSingleServer()
.setPassword(password)
.setAddress(address)
.setConnectionPoolSize(poolSize)
.setConnectionMinimumIdleSize(minIdle)
@@ -59,6 +66,7 @@ public class RedissonConfig {
String[] clusterAddresses = StrUtil.splitToArray(address, ',');
config.setLockWatchdogTimeout(lockWatchdogTimeout)
.useClusterServers()
.setPassword(password)
.addNodeAddress(clusterAddresses)
.setConnectTimeout(timeout)
.setMasterConnectionPoolSize(poolSize);
@@ -66,6 +74,7 @@ public class RedissonConfig {
String[] sentinelAddresses = StrUtil.splitToArray(address, ',');
config.setLockWatchdogTimeout(lockWatchdogTimeout)
.useSentinelServers()
.setPassword(password)
.setMasterName(masterName)
.addSentinelAddress(sentinelAddresses)
.setConnectTimeout(timeout)
@@ -80,6 +89,7 @@ public class RedissonConfig {
ArrayUtil.copy(masterSlaveAddresses, 1, slaveAddresses, 0, slaveAddresses.length);
config.setLockWatchdogTimeout(lockWatchdogTimeout)
.useMasterSlaveServers()
.setPassword(password)
.setMasterAddress(masterSlaveAddresses[0])
.addSlaveAddress(slaveAddresses)
.setConnectTimeout(timeout)

View File

@@ -31,7 +31,6 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -66,23 +65,20 @@
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -93,8 +89,6 @@
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -180,6 +174,11 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

View File

@@ -21,23 +21,23 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.8" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.8" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.8" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.8" level="project" />
<orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.8" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
<orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-core:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.1.7" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
<orderEntry type="module" module-name="common-core" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.10.RELEASE" level="project" />
@@ -48,7 +48,6 @@
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.45" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
@@ -83,23 +82,20 @@
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-starter:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-core:1.1.5" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-base:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-weekend:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
<orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.5" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
@@ -110,8 +106,6 @@
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -197,6 +191,11 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />

View File

@@ -19,6 +19,16 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-micro-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.orange.demo</groupId>

View File

@@ -11,7 +11,7 @@ import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/**
* 自动加载bean的配置对象。
@@ -19,7 +19,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
* @author Jerry
* @date 2020-08-08
*/
@EnableSwagger2
@EnableSwagger2WebMvc
@EnableKnife4j
@EnableConfigurationProperties(SwaggerProperties.class)
@ConditionalOnProperty(prefix = "swagger", name = "enabled")

View File

@@ -17,7 +17,7 @@ import java.util.List;
* @date 2020-08-08
*/
@Slf4j
public class ByteBodyUtils {
public class ByteBuddyUtil {
private static final ClassPool CLASS_POOL = ClassPool.getDefault();
public static Class<?> createDynamicModelClass(String name, List<ResolvedMethodParameter> parameters) {
@@ -36,7 +36,7 @@ public class ByteBodyUtils {
for (ResolvedMethodParameter dynamicParameter : parameters) {
// 因为在调用这个方法之前这些参数都包含MyRequestBody注解
MyRequestBody myRequestBody =
dynamicParameter.findAnnotation(MyRequestBody.class).orNull();
dynamicParameter.findAnnotation(MyRequestBody.class).orElse(null);
Assert.notNull(myRequestBody);
String fieldName = dynamicParameter.defaultName().isPresent()
? dynamicParameter.defaultName().get() : "parameter";

View File

@@ -47,7 +47,7 @@ public class DynamicBodyModelPlugin implements OperationModelsProviderPlugin {
}
String groupName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, context.getGroupName());
String clazzName = groupName + StringUtils.capitalize(context.getName());
Class<?> clazz = ByteBodyUtils.createDynamicModelClass(clazzName, bodyParameter);
Class<?> clazz = ByteBuddyUtil.createDynamicModelClass(clazzName, bodyParameter);
if (clazz != null) {
context.operationModelsBuilder().addInputParam(typeResolver.resolve(clazz));
}

View File

@@ -17,9 +17,6 @@
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:2.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
@@ -117,6 +114,11 @@
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.10" level="project" />
<orderEntry type="library" name="Maven: com.lmax:disruptor:3.4.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.14.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.10.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.10.RELEASE" level="project" />