From c23cad893b1fe995f6dc0788ba4454218fbbb6c3 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 17 三月 2026 10:23:54 +0800
Subject: [PATCH] #
---
zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 2 +-
zy-acs-flow/public/imports/code_import_template.xlsx | 0
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java | 2 +-
zy-acs-flow/public/imports/loc_import_template.xlsx | 0
zy-acs-flow/public/imports/route_import_template.xlsx | 0
6 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/public/imports/code_import_template.xlsx b/zy-acs-flow/public/imports/code_import_template.xlsx
index 929295f..19a7e19 100644
--- a/zy-acs-flow/public/imports/code_import_template.xlsx
+++ b/zy-acs-flow/public/imports/code_import_template.xlsx
Binary files differ
diff --git a/zy-acs-flow/public/imports/loc_import_template.xlsx b/zy-acs-flow/public/imports/loc_import_template.xlsx
new file mode 100644
index 0000000..5dae55f
--- /dev/null
+++ b/zy-acs-flow/public/imports/loc_import_template.xlsx
Binary files differ
diff --git a/zy-acs-flow/public/imports/route_import_template.xlsx b/zy-acs-flow/public/imports/route_import_template.xlsx
index 801ad8d..a33a56d 100644
--- a/zy-acs-flow/public/imports/route_import_template.xlsx
+++ b/zy-acs-flow/public/imports/route_import_template.xlsx
Binary files differ
diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java
index a00775d..89d0f6c 100644
--- a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java
+++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java
@@ -108,7 +108,7 @@
/**
* map 杞� 瀵硅薄
*/
- public static <T> T conver(Map<? extends String, ?> map, Class<T> cls){
+ public static <T> T convert(Map<? extends String, ?> map, Class<T> cls){
T instance = null;
try {
Constructor<T> constructor = cls.getDeclaredConstructor();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index 4331664..b5c4826 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -159,7 +159,7 @@
public R importBatch(@RequestBody List<Map<String, Object>> list) {
Date now = new Date(); Long userId = getLoginUserId();
for (Map<String, Object> map : list) {
- Code code = Cools.conver(map, Code.class);
+ Code code = Cools.convert(map, Code.class);
if (null != codeService.getCacheByData(code.getData())) {
continue;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
index 6e370b7..7267db6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/RouteController.java
@@ -206,7 +206,7 @@
key = Utils.toCamelCase(key);
one.put(key, entry.getValue());
}
- RouteExcel excelDto = Cools.conver(one, RouteExcel.class);
+ RouteExcel excelDto = Cools.convert(one, RouteExcel.class);
Code code0 = codeService.getCacheByData(Utils.zeroFill(excelDto.getStartCode(), CommonConstant.QR_CODE_LEN));
Code code1 = codeService.getCacheByData(Utils.zeroFill(excelDto.getEndCode(), CommonConstant.QR_CODE_LEN));
--
Gitblit v1.9.1