From 517966d4dbed6ef6e5d591720b971af427e6b63a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 04 十二月 2025 15:25:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 6ebc843..f6d7573 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -140,6 +140,13 @@
return R.ok().add(basMap.getData());
}
+ @GetMapping("/basMap/getLevList")
+ @ManagerAuth
+ public R getLevList() {
+ List<Integer> levList = basMapService.getLevList();
+ return R.ok().add(levList);
+ }
+
@Autowired
private MapExcelUtils mapExcelUtils;
@@ -151,9 +158,9 @@
HashMap<Integer, List<List<HashMap<String, Object>>>> dataMap = mapExcelUtils.readExcel(filePath);
- List<List<HashMap<String, Object>>> dataList = new ArrayList<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
- Integer key = entry.getKey();
+ Integer lev = entry.getKey();
+ List<List<HashMap<String, Object>>> dataList = new ArrayList<>();
List<List<HashMap<String, Object>>> list = entry.getValue();
for (int i = 0; i < list.size(); i++) {
@@ -195,18 +202,18 @@
}
dataList.add(arrayList);
}
- }
- BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
- if (basMap == null){
- basMap = new BasMap();
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ if (basMap == null){
+ basMap = new BasMap();
+ }
+ basMap.setData(JSON.toJSONString(dataList));
+ basMap.setOriginData(JSON.toJSONString(dataList));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(lev);
+ basMapService.insertOrUpdate(basMap);
}
- basMap.setLev(1);
- basMap.setData(JSON.toJSONString(dataList));
- basMap.setOriginData(JSON.toJSONString(dataList));
- basMap.setCreateTime(new Date());
- basMap.setUpdateTime(new Date());
- basMapService.insertOrUpdate(basMap);
return R.ok();
}
--
Gitblit v1.9.1