整理代码

futian.liu

2023-11-13 11f925fdce0f58d1f321f3a13a3f3e84221c6912

整理代码

 consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java

@@ -9,7 +9,7 @@
import com.consum.base.pojo.FinSysTenantSearchParam;
import com.consum.base.service.FinSysTenantServiceImpl;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.base.util.FinSysTenantUtils;
import com.consum.base.core.utils.FinSysTenantUtils;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.vo.FinSysTenantUserResult;

 consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java

@@ -4,7 +4,7 @@
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.response.WarehouseFlowVO;
import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.util.MapUtils;
import com.consum.base.core.utils.MapUtils;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;

 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -4,7 +4,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.tools.MapperUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWhFormProcureGoodsParams;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParams;
@@ -23,7 +23,7 @@
import com.consum.base.service.LWhFormProcureService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.util.MapUtils;
import com.consum.base.core.utils.MapUtils;
import com.consum.model.po.BaseGoodsTemplate;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;

 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java

@@ -15,7 +15,7 @@
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;

 consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java

@@ -1,7 +1,7 @@
package com.consum.base.core;


import com.consum.base.core.tools.SqlParameter;
import com.consum.base.core.utils.SqlParameter;
import com.consum.model.po.BaseCodeIndexing;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;

 consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java

@@ -2,13 +2,12 @@

import com.consum.base.core.param.BaseWarehouseParam;
import com.consum.base.core.param.DepBackWarehouseParam;
import com.consum.base.core.tools.SqlParameter;
import com.consum.base.core.tools.SuperMap;
import com.consum.base.core.util.DateUtil;
import com.consum.base.core.utils.SqlParameter;
import com.consum.base.core.utils.SuperMap;
import com.consum.base.core.utils.DateUtil;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
import org.bouncycastle.jcajce.provider.asymmetric.GOST;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java

@@ -2,9 +2,9 @@

import com.consum.base.core.param.BaseWarehouseParam;
import com.consum.base.core.param.DepBackWarehouseParam;
import com.consum.base.core.tools.SqlParameter;
import com.consum.base.core.tools.SuperMap;
import com.consum.base.core.util.DateUtil;
import com.consum.base.core.utils.SqlParameter;
import com.consum.base.core.utils.SuperMap;
import com.consum.base.core.utils.DateUtil;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;

 consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java

@@ -1,8 +1,8 @@
package com.consum.base.core;

import com.consum.base.core.param.BaseWarehouseParam;
import com.consum.base.core.tools.SqlParameter;
import com.consum.base.core.util.DateUtil;
import com.consum.base.core.utils.SqlParameter;
import com.consum.base.core.utils.DateUtil;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;

 consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java

File was renamed from consum-base/src/main/java/com/consum/base/core/util/DateUtil.java
@@ -1,9 +1,8 @@
package com.consum.base.core.util;
package com.consum.base.core.utils;

import com.walker.infrastructure.utils.DateUtils;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;

public class DateUtil extends DateUtils {

 consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java

 consum-base/src/main/java/com/consum/base/core/utils/FinSysTenantUtils.java

File was renamed from consum-base/src/main/java/com/consum/base/util/FinSysTenantUtils.java
@@ -1,4 +1,4 @@
package com.consum.base.util;
package com.consum.base.core.utils;

import com.consum.base.support.FinSysTenantGenerator;
import com.consum.base.support.FinSysTenantGeneratorTow;

 consum-base/src/main/java/com/consum/base/core/utils/IdUtil.java

File was renamed from consum-base/src/main/java/com/consum/base/util/IdUtil.java
@@ -1,4 +1,4 @@
package com.consum.base.util;
package com.consum.base.core.utils;

public class IdUtil {


 consum-base/src/main/java/com/consum/base/core/utils/LockManage.java

File was renamed from consum-base/src/main/java/com/consum/base/core/util/LockManage.java
@@ -1,4 +1,4 @@
package com.consum.base.core.util;
package com.consum.base.core.utils;

import java.util.concurrent.ConcurrentHashMap;


 consum-base/src/main/java/com/consum/base/core/utils/MapRowMapper.java

File was renamed from consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
@@ -1,4 +1,4 @@
package com.consum.base.core.tools;
package com.consum.base.core.utils;

import org.springframework.jdbc.core.RowMapper;


 consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java

File was renamed from consum-base/src/main/java/com/consum/base/util/MapUtils.java
@@ -1,12 +1,24 @@
package com.consum.base.util;
package com.consum.base.core.utils;

import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class MapUtils {

    public static final char UNDERLINE = '_';

    /**
     * 把map转换成对象
     *
     * @param map
     * @param clazz
     * @param <T>
     * @return
     */
    public static <T> T convertMapToObj(Map<String, Object> map, Class<T> clazz) {
        try {
            T obj = clazz.newInstance();
@@ -16,18 +28,12 @@
                field.set(obj, entry.getValue());
            }
            return obj;
        } catch (InstantiationException e) {
            e.printStackTrace();
        } catch (IllegalAccessException e) {
            e.printStackTrace();
        } catch (NoSuchFieldException e) {
            e.printStackTrace();
        } catch (InstantiationException | IllegalAccessException | NoSuchFieldException e) {
            log.error(e.getMessage(), e);
        }
        return null;
    }


    public static final char UNDERLINE = '_';

    /**
     * 把map的key转换成驼峰命名
@@ -43,7 +49,7 @@

            while (var2.hasNext()) {
                Map.Entry<String, Object> entry = (Map.Entry) var2.next();
                reMap.put(underlineToCamel((String) entry.getKey()), map.get(entry.getKey()));
                reMap.put(underlineToCamel(entry.getKey()), map.get(entry.getKey()));
            }

            map.clear();
@@ -59,6 +65,7 @@
     * @param param
     * @return
     */

    public static String underlineToCamel(String param) {
        if (param == null || "".equals(param.trim())) {
            return "";

 consum-base/src/main/java/com/consum/base/core/utils/MapperUtil.java

File was renamed from consum-base/src/main/java/com/consum/base/core/tools/MapperUtil.java
@@ -1,18 +1,19 @@
package com.consum.base.core.tools;
package com.consum.base.core.utils;

import com.consum.base.util.MapUtils;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.core.RowMapper;

/**
 * @author asus
 * @version 1.0
 * @description: TODO
 * @description: Mapper map工具类
 * @date 2023/11/11 14:40
 */
@Slf4j
public class MapperUtil implements RowMapper<Map<String, Object>> {

    @Override

 consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java

File was renamed from consum-base/src/main/java/com/consum/base/core/util/RandomUtil.java
@@ -1,6 +1,5 @@
package com.consum.base.core.util;
package com.consum.base.core.utils;

import com.consum.base.util.IdUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.crypto.codec.Hex;


 consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java

 consum-base/src/main/java/com/consum/base/core/utils/SqlParameter.java

File was renamed from consum-base/src/main/java/com/consum/base/core/tools/SqlParameter.java
@@ -1,7 +1,6 @@
package com.consum.base.core.tools;
package com.consum.base.core.utils;

import java.util.HashMap;
import java.util.Map;

public class SqlParameter extends HashMap {


 consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java

File was renamed from consum-base/src/main/java/com/consum/base/core/tools/SuperMap.java
@@ -1,6 +1,4 @@
package com.consum.base.core.tools;

import net.bytebuddy.implementation.bind.annotation.Super;
package com.consum.base.core.utils;

import java.util.HashMap;
import java.util.Map;

 consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java

@@ -3,7 +3,7 @@
import com.consum.base.Constants;
import com.consum.base.pojo.BaseCategoryParam;
import com.consum.base.pojo.ProjectTreeResult;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseCategory;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;

 consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java

@@ -1,7 +1,7 @@
package com.consum.base.service;

import com.consum.base.Constants;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseGoodsModels;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;

 consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java

@@ -3,7 +3,7 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.pojo.BaseGoodsTemplateParam;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseGoodsTemplate;

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseWarehouseManager;
import com.walker.jdbc.service.BaseServiceImpl;
import org.springframework.stereotype.Service;

 consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java

@@ -3,7 +3,7 @@
import com.consum.base.Constants;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;

 consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java

@@ -2,12 +2,9 @@

import com.consum.base.Constants;
import com.consum.base.pojo.FinSysTenantDepartmentParam;
import com.consum.base.util.IdUtil;
import com.consum.model.po.BaseCategory;
import com.consum.model.po.FinSysTenant;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;

 consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.util.LockManage;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.LGoodsUserRecord;
import com.consum.model.po.LWhFormTransfer;
import com.consum.model.po.LWhProcureModelUser;

 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.util.LockManage;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;

 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.tools.MapRowMapper;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;

 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java

@@ -3,7 +3,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.NumberGenerator;

 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.LWhFormInventoryGoods;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;

 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java

@@ -2,10 +2,10 @@

import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.tools.MapRowMapper;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.pojo.LWhFormInventoryDto;
import com.consum.base.pojo.LWhFormInventoryParam;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;

 consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java

@@ -4,7 +4,7 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.core.util.LockManage;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;

 consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java

@@ -4,18 +4,16 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.pojo.*;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.HashMap;

 consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.tools.MapperUtil;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.query.FormProcureQryDto;
import com.consum.model.po.LWhFormProcure;
import com.walker.db.page.GenericPager;

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java

@@ -1,7 +1,7 @@
package com.consum.base.service;

import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.util.LockManage;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;

 consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java

@@ -2,9 +2,9 @@

import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.tools.MapRowMapper;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.pojo.*;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

@@ -1,6 +1,6 @@
package com.consum.base.service;

import com.consum.base.core.util.LockManage;
import com.consum.base.core.utils.LockManage;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;

 consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java

@@ -2,12 +2,12 @@

import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.tools.MapRowMapper;
import com.consum.base.core.utils.MapRowMapper;
import com.consum.base.pojo.LWhFormTransferParam;
import com.consum.base.pojo.LWhProcureModelParams;
import com.consum.base.pojo.LWhProcureModelUserDTO;
import com.consum.base.pojo.query.TransferQryDto;
import com.consum.base.util.IdUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;