Przeglądaj źródła

08 05 03 remove utils package

hr 4 lat temu
rodzic
commit
d8a4fd507e

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/AccountingProductServiceImpl.java

@@ -16,7 +16,7 @@ import com.imed.costaccount.model.dto.AccountProductSaveDTO;
 import com.imed.costaccount.model.vo.AccountProductVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.service.AccountingProductService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/AccountingServiceImpl.java

@@ -14,7 +14,7 @@ import com.imed.costaccount.model.vo.AccountVO;
 import com.imed.costaccount.model.vo.SelectAccountingVO;
 import com.imed.costaccount.service.AccountingService;
 import com.imed.costaccount.service.CostShareParamService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/CostAccountShareServiceImpl.java

@@ -17,7 +17,7 @@ import com.imed.costaccount.model.vo.CostShareParamStatusVO;
 import com.imed.costaccount.model.vo.CostShareParamVO;
 import com.imed.costaccount.model.vo.ShareParamProportionVO;
 import com.imed.costaccount.service.*;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/CostResponsibilityDepartmentServiceImpl.java

@@ -10,7 +10,7 @@ import com.imed.costaccount.model.Department;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.vo.CostDepartmentVO;
 import com.imed.costaccount.service.CostResponsibilityDepartmentService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/CostShareLevelServiceImpl.java

@@ -12,7 +12,7 @@ import com.imed.costaccount.model.dto.CostShareLevelEditDto;
 import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
 import com.imed.costaccount.model.vo.CostShareLevelVO;
 import com.imed.costaccount.service.CostShareLevelService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -17,7 +17,7 @@ import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.HospitalAllVO;
 import com.imed.costaccount.model.vo.HospitalVO;
 import com.imed.costaccount.service.HospitalService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/MenuServiceImpl.java

@@ -17,7 +17,7 @@ import com.imed.costaccount.model.vo.MenuVO;
 import com.imed.costaccount.model.vo.NavVO;
 import com.imed.costaccount.service.MenuService;
 import com.imed.costaccount.service.UserService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/ProductServiceImpl.java

@@ -19,7 +19,7 @@ import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.service.ProductService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/ReportFormServiceImpl.java

@@ -13,7 +13,7 @@ import com.imed.costaccount.model.vo.RelationVO;
 import com.imed.costaccount.model.vo.ReportFormVO;
 import com.imed.costaccount.service.ReportFormService;
 import com.imed.costaccount.service.ReportRelationService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -14,7 +14,7 @@ import com.imed.costaccount.model.dto.ResponsibilityEditDTO;
 import com.imed.costaccount.model.dto.ResponsibilitySaveDTO;
 import com.imed.costaccount.model.vo.*;
 import com.imed.costaccount.service.ResponsibilityService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/RoleMenuServiceImpl.java

@@ -13,7 +13,7 @@ import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.MenuVO;
 import com.imed.costaccount.service.MenuService;
 import com.imed.costaccount.service.RoleMenuService;
-import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.common.util.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/RoleServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.RoleMapper;
 import com.imed.costaccount.model.Role;
@@ -15,7 +16,6 @@ import com.imed.costaccount.model.dto.RoleSaveDTO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.RoleVO;
 import com.imed.costaccount.service.*;
-import com.imed.costaccount.utils.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

+ 0 - 150
src/main/java/com/imed/costaccount/utils/BeanUtil.java

@@ -1,150 +0,0 @@
-package com.imed.costaccount.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-@Slf4j
-public final class BeanUtil {
-
-    /**
-     * 将对象转为为指定的对象
-     *
-     * @param source
-     * @param <T>
-     * @return
-     */
-    public static <T> T convertObj(Object source, Class<T> clazz) {
-        Object model = null;
-        if (source == null || clazz == null) {
-            return null;
-        }
-
-        try {
-            model = clazz.newInstance();
-        } catch (Exception e) {
-            log.error("将对象转为为指定的对象异常", e);
-        }
-        BeanUtils.copyProperties(source, model);
-        return (T) model;
-    }
-
-    public static <T> T convertObj(Object source, T result) {
-        BeanUtils.copyProperties(source, result);
-        return result;
-    }
-
-    public static <F, T> List<T> convertList(List<F> fromList, Class<T> tClass) {
-        List<T> tList = new ArrayList<>();
-        if (CollectionUtils.isEmpty(fromList)) {
-            return tList;
-        }
-        fromList.forEach(f -> tList.add(convertObj(f, tClass)));
-        return tList;
-    }
-
-    public static <F, T> List<T> convertListIgnoreCase(List<F> fromList, Class<T> clazz) {
-        List<T> tList = new ArrayList<>();
-        if (CollectionUtils.isEmpty(fromList)) {
-            return tList;
-        }
-        fromList.forEach(f -> {
-            try {
-                tList.add(copyIgnoreCase(f, clazz.newInstance()));
-            } catch (Exception e) {
-                log.error("将对象转为为指定的对象异常", e);
-            }
-        });
-        return tList;
-    }
-
-    /**
-     * 模仿Spring中 BeanUtils.copyProperties(source,target)
-     * 类型不同不可以转换
-     * 但是
-     * 大小写可以忽略
-     * 下划线 _ 被忽略
-     *
-     * @param source
-     * @param clazz
-     * @param <T>
-     * @return
-     */
-    public static <T> T copyIgnoreCase(Object source, Class<T> clazz) {
-        try {
-            return copyIgnoreCase(source, clazz.newInstance());
-        } catch (Exception e) {
-            log.error("将对象转为为指定的对象异常", e);
-        }
-        return null;
-    }
-
-    /**
-     * 模仿Spring中 BeanUtils.copyProperties(source,target)
-     * 类型不同不可以转换
-     * 但是
-     * 大小写可以忽略
-     * 下划线 _ 被忽略
-     *
-     * @param source
-     * @param target
-     * @param <T>
-     * @return
-     */
-    public static <T> T copyIgnoreCase(Object source, T target) {
-        Map<String, Field> sourceMap = CacheFieldMap.getFieldMap(source.getClass());
-        CacheFieldMap.getFieldMap(target.getClass()).forEach((k, it) -> {
-            Field field = sourceMap.get(k);
-            if (field != null && field.getType().equals(it.getType())) {
-                it.setAccessible(true);
-                field.setAccessible(true);
-                try {
-                    it.set(target, field.get(source));
-                } catch (Exception e) {
-                    log.error("对象复制错误", e);
-                }
-            }
-        });
-        return target;
-    }
-
-    private static class CacheFieldMap {
-        private static Map<String, Map<String, Field>> cacheMap = new HashMap<>();
-
-        private static final String SER_STR = "serialVersionUID";
-
-        private static Map<String, Field> getFieldMap(Class clazz) {
-            final String name = clazz.getName();
-            Map<String, Field> result = cacheMap.get(name);
-            if (result != null) {
-                return result;
-            }
-            synchronized (name) {
-                if (result != null) {
-                    return result;
-                }
-                Map<String, Field> fieldMap = new HashMap<>();
-                for (; clazz != Object.class; clazz = clazz.getSuperclass()) {
-                    Arrays.stream(clazz.getDeclaredFields()).forEach(field -> {
-                                //忽略序列号字段
-                                if (SER_STR.equals(field.getName())) {
-                                    return;
-                                }
-                                fieldMap.put(field.getName().toLowerCase().replace("_", ""), field);
-                            }
-                    );
-                }
-                cacheMap.put(name, fieldMap);
-                return fieldMap;
-            }
-        }
-    }
-
-    public static <T> T copyProperties(Object source, T result) {
-        BeanUtils.copyProperties(source, result);
-        return result;
-    }
-}