From 11f925fdce0f58d1f321f3a13a3f3e84221c6912 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 09:27:14 +0800
Subject: [PATCH] 整理代码
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/core/utils/FinSysTenantUtils.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 2
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java | 7 +-
consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java | 2
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java | 2
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 2
consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java | 6 +-
consum-base/src/main/java/com/consum/base/core/utils/MapperUtil.java | 7 +-
consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java | 0
consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java | 4
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 4
consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 2
consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java | 5 -
consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java | 27 +++++---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 2
consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java | 2
consum-base/src/main/java/com/consum/base/core/utils/IdUtil.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java | 2
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 4 -
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 2
consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java | 4 -
consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java | 3
consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java | 0
consum-base/src/main/java/com/consum/base/core/utils/LockManage.java | 2
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 2
consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java | 2
consum-base/src/main/java/com/consum/base/core/utils/SqlParameter.java | 3
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 4
consum-base/src/main/java/com/consum/base/core/utils/MapRowMapper.java | 2
consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java | 3
consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java | 2
consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java | 2
39 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 85fa9bd..25f650a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index 3608468..3cacb64 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 746e598..da7ea2e 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 32b784a..737e33f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java b/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
index 83bbca7..623102a 100644
--- a/consum-base/src/main/java/com/consum/base/core/CodeGeneratorService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
index 669e63e..621d496 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java b/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
index 01caafb..3ace85a 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseBusinessServiceBAK.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
index f0a604b..feab773 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/core/util/DateUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java
similarity index 89%
rename from consum-base/src/main/java/com/consum/base/core/util/DateUtil.java
rename to consum-base/src/main/java/com/consum/base/core/utils/DateUtil.java
index 060d6ed..e4bba75 100644
--- a/consum-base/src/main/java/com/consum/base/core/util/DateUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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 {
diff --git a/consum-base/src/main/java/com/consum/base/util/FinSysOrgUtils.java b/consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java
similarity index 100%
rename from consum-base/src/main/java/com/consum/base/util/FinSysOrgUtils.java
rename to consum-base/src/main/java/com/consum/base/core/utils/FinSysOrgUtils.java
diff --git a/consum-base/src/main/java/com/consum/base/util/FinSysTenantUtils.java b/consum-base/src/main/java/com/consum/base/core/utils/FinSysTenantUtils.java
similarity index 96%
rename from consum-base/src/main/java/com/consum/base/util/FinSysTenantUtils.java
rename to consum-base/src/main/java/com/consum/base/core/utils/FinSysTenantUtils.java
index f507049..34ef926 100644
--- a/consum-base/src/main/java/com/consum/base/util/FinSysTenantUtils.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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;
diff --git a/consum-base/src/main/java/com/consum/base/util/IdUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/IdUtil.java
similarity index 97%
rename from consum-base/src/main/java/com/consum/base/util/IdUtil.java
rename to consum-base/src/main/java/com/consum/base/core/utils/IdUtil.java
index 7551199..2973d9d 100644
--- a/consum-base/src/main/java/com/consum/base/util/IdUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/IdUtil.java
@@ -1,4 +1,4 @@
-package com.consum.base.util;
+package com.consum.base.core.utils;
public class IdUtil {
diff --git a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java b/consum-base/src/main/java/com/consum/base/core/utils/LockManage.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/core/util/LockManage.java
rename to consum-base/src/main/java/com/consum/base/core/utils/LockManage.java
index a75169d..6ff217c 100644
--- a/consum-base/src/main/java/com/consum/base/core/util/LockManage.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/LockManage.java
@@ -1,4 +1,4 @@
-package com.consum.base.core.util;
+package com.consum.base.core.utils;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java b/consum-base/src/main/java/com/consum/base/core/utils/MapRowMapper.java
similarity index 95%
rename from consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
rename to consum-base/src/main/java/com/consum/base/core/utils/MapRowMapper.java
index abbaf48..1ea3f79 100644
--- a/consum-base/src/main/java/com/consum/base/core/tools/MapRowMapper.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/MapRowMapper.java
@@ -1,4 +1,4 @@
-package com.consum.base.core.tools;
+package com.consum.base.core.utils;
import org.springframework.jdbc.core.RowMapper;
diff --git a/consum-base/src/main/java/com/consum/base/util/MapUtils.java b/consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java
similarity index 81%
rename from consum-base/src/main/java/com/consum/base/util/MapUtils.java
rename to consum-base/src/main/java/com/consum/base/core/utils/MapUtils.java
index 92cf4f5..b092d9c 100644
--- a/consum-base/src/main/java/com/consum/base/util/MapUtils.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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 = '_';
+
+ /**
+ * 鎶妋ap杞崲鎴愬璞�
+ *
+ * @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 = '_';
/**
* 鎶妋ap鐨刱ey杞崲鎴愰┘宄板懡鍚�
@@ -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 "";
diff --git a/consum-base/src/main/java/com/consum/base/core/tools/MapperUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/MapperUtil.java
similarity index 87%
rename from consum-base/src/main/java/com/consum/base/core/tools/MapperUtil.java
rename to consum-base/src/main/java/com/consum/base/core/utils/MapperUtil.java
index 8f01fff..688e97c 100644
--- a/consum-base/src/main/java/com/consum/base/core/tools/MapperUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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
diff --git a/consum-base/src/main/java/com/consum/base/core/util/RandomUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java
similarity index 95%
rename from consum-base/src/main/java/com/consum/base/core/util/RandomUtil.java
rename to consum-base/src/main/java/com/consum/base/core/utils/RandomUtil.java
index 2de34d8..5fc9da2 100644
--- a/consum-base/src/main/java/com/consum/base/core/util/RandomUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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;
diff --git a/consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java
similarity index 100%
rename from consum-base/src/main/java/com/consum/base/util/RangeMergeUtil.java
rename to consum-base/src/main/java/com/consum/base/core/utils/RangeMergeUtil.java
diff --git a/consum-base/src/main/java/com/consum/base/core/tools/SqlParameter.java b/consum-base/src/main/java/com/consum/base/core/utils/SqlParameter.java
similarity index 87%
rename from consum-base/src/main/java/com/consum/base/core/tools/SqlParameter.java
rename to consum-base/src/main/java/com/consum/base/core/utils/SqlParameter.java
index 20dbe89..a1026ef 100644
--- a/consum-base/src/main/java/com/consum/base/core/tools/SqlParameter.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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 {
diff --git a/consum-base/src/main/java/com/consum/base/core/tools/SuperMap.java b/consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java
similarity index 87%
rename from consum-base/src/main/java/com/consum/base/core/tools/SuperMap.java
rename to consum-base/src/main/java/com/consum/base/core/utils/SuperMap.java
index edef8f2..18f2196 100644
--- a/consum-base/src/main/java/com/consum/base/core/tools/SuperMap.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index beb28d3..337af22 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
index cc0c2cf..88d68c3 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsModelsServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 2c12708..24fa924 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java
index 5ef7473..180efd4 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseManagerServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
index 04840be..62d7e43 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseWarehouseServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java
index ef8975f..99b1cbd 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantDepartmentServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java b/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
index ea5841e..70332ee 100644
--- a/consum-base/src/main/java/com/consum/base/service/LGoodsUserRecordCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
index 937a759..d85b03e 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java b/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
index 1751794..96a398a 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index 9df82b6..8fbc1ba 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
index f585a74..9ec51b6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index f23846e..f1ad54d 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index 3e32a02..a870d09 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index e79b9e0..d52b1d7 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index 5f497b8..d354ab1 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
index 2eed7e3..28d8941 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 59f876e..d7b2604 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
index 75e2dd2..aad0c77 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/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;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index 9cb5f1d..c13593f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/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;
--
Gitblit v1.9.1