From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java | 107 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
index 99441b5..e9c1f19 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java
@@ -1,20 +1,21 @@
package com.ruoyi.common.core.mybatisplus.core;
import cn.hutool.core.bean.copier.CopyOptions;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ResolvableType;
import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -23,11 +24,14 @@
/**
* IServicePlus 瀹炵幇绫�
*
+ * @param <M> Mapper绫�
+ * @param <T> 鏁版嵁瀹炰綋绫�
+ * @param <V> vo绫�
* @author Lion Li
*/
@Slf4j
@SuppressWarnings("unchecked")
-public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, K> extends ServiceImpl<M, T> implements IServicePlus<T, K> {
+public class ServicePlusImpl<M extends BaseMapperPlus<T>, T, V> extends ServiceImpl<M, T> implements IServicePlus<T, V> {
@Autowired
protected M baseMapper;
@@ -45,31 +49,26 @@
return entityClass;
}
- protected Class<T> mapperClass = currentMapperClass();
+ protected Class<M> mapperClass = currentMapperClass();
- protected Class<K> voClass = currentVoClass();
+ protected Class<V> voClass = currentVoClass();
- public Class<K> getVoClass() {
+ public Class<V> getVoClass() {
return voClass;
}
@Override
- protected Class<T> currentMapperClass() {
- return (Class<T>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(0).getType();
+ protected Class<M> currentMapperClass() {
+ return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 0);
}
@Override
protected Class<T> currentModelClass() {
- return (Class<T>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(1).getType();
+ return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 1);
}
- protected Class<K> currentVoClass() {
- return (Class<K>) this.getResolvableType().as(ServicePlusImpl.class).getGeneric(2).getType();
- }
-
- @Override
- protected ResolvableType getResolvableType() {
- return ResolvableType.forClass(ClassUtils.getUserClass(getClass()));
+ protected Class<V> currentVoClass() {
+ return (Class<V>) ReflectionKit.getSuperClassGenericType(this.getClass(), ServicePlusImpl.class, 2);
}
/**
@@ -119,31 +118,45 @@
/**
* 鍗晄ql鎵归噺鎻掑叆( 鍏ㄩ噺濉厖 )
- * 閫傜敤浜庢棤鑴戞彃鍏�
*/
@Override
public boolean saveAll(Collection<T> entityList) {
- ArrayList<T> list = new ArrayList<>();
- for (T t : entityList) {
- try {
- //鑾峰彇灞炴�ф敞瑙ｇ殑value鍊�
- Field f = t.getClass().getDeclaredField("id");
- f.setAccessible( true );//璁剧疆鍙互鑼冨洿private
- Object o = f.get(t);//鑾峰彇鍑篿d鐨勫��
- System.out.println(o);
- if (o == null) {
- //濡傛灉id涓簄ull,鎻掑叆
- list.add(t);
- } else {
- //鍚﹀垯鏇存柊
- baseMapper.updateById(t);
- }
+ if (CollUtil.isEmpty(entityList)) {
+ return false;
+ }
+ return baseMapper.insertAll(entityList) == entityList.size();
+ }
- } catch (Exception e) {
- e.printStackTrace();
+ /**
+ * 鍏ㄩ噺淇濆瓨鎴栨洿鏂� ( 鎸変富閿尯鍒� )
+ */
+ @Override
+ public boolean saveOrUpdateAll(Collection<T> entityList) {
+ if (CollUtil.isEmpty(entityList)) {
+ return false;
+ }
+ TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
+ Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
+ String keyProperty = tableInfo.getKeyProperty();
+ Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
+ List<T> addList = new ArrayList<>();
+ List<T> updateList = new ArrayList<>();
+ int row = 0;
+ for (T entity : entityList) {
+ Object id = ReflectUtils.invokeGetter(entity, keyProperty);
+ if (ObjectUtil.isNull(id)) {
+ addList.add(entity);
+ } else {
+ updateList.add(entity);
}
}
- return baseMapper.insertAll(list) == list.size();
+ if (CollUtil.isNotEmpty(updateList) && updateBatchById(updateList)) {
+ row += updateList.size();
+ }
+ if (CollUtil.isNotEmpty(addList)) {
+ row += baseMapper.insertAll(addList);
+ }
+ return row == entityList.size();
}
/**
@@ -152,7 +165,7 @@
* @param id 涓婚敭ID
*/
@Override
- public K getVoById(Serializable id, CopyOptions copyOptions) {
+ public V getVoById(Serializable id, CopyOptions copyOptions) {
T t = getBaseMapper().selectById(id);
return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
@@ -163,7 +176,7 @@
* @param idList 涓婚敭ID鍒楄〃
*/
@Override
- public List<K> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
+ public List<V> listVoByIds(Collection<? extends Serializable> idList, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectBatchIds(idList);
if (list == null) {
return null;
@@ -177,7 +190,7 @@
* @param columnMap 琛ㄥ瓧娈� map 瀵硅薄
*/
@Override
- public List<K> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
+ public List<V> listVoByMap(Map<String, Object> columnMap, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectByMap(columnMap);
if (list == null) {
return null;
@@ -192,7 +205,7 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public K getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ public V getVoOne(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
T t = getOne(queryWrapper, true);
return BeanCopyUtils.oneCopy(t, copyOptions, voClass);
}
@@ -203,7 +216,7 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫� {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
*/
@Override
- public List<K> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ public List<V> listVo(Wrapper<T> queryWrapper, CopyOptions copyOptions) {
List<T> list = getBaseMapper().selectList(queryWrapper);
if (list == null) {
return null;
@@ -218,9 +231,9 @@
* @param queryWrapper 瀹炰綋瀵硅薄灏佽鎿嶄綔绫�
*/
@Override
- public PagePlus<T, K> pageVo(PagePlus<T, K> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
- PagePlus<T, K> result = getBaseMapper().selectPage(page, queryWrapper);
- List<K> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
+ public PagePlus<T, V> pageVo(PagePlus<T, V> page, Wrapper<T> queryWrapper, CopyOptions copyOptions) {
+ PagePlus<T, V> result = getBaseMapper().selectPage(page, queryWrapper);
+ List<V> volist = BeanCopyUtils.listCopy(result.getRecords(), copyOptions, voClass);
result.setRecordsVo(volist);
return result;
}
--
Gitblit v1.9.3