From 7f9435bb4a074b4964f290c4d6905e0e233a19ec Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 十一月 2025 12:56:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 9ed269b..f6d7573 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -130,6 +130,23 @@
return R.ok();
}
+ @GetMapping("/basMap/lev/{lev}/auth")
+ @ManagerAuth
+ public R getByLev(@PathVariable("lev") Integer lev) {
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", lev));
+ if (basMap == null){
+ return R.error("鍦板浘涓嶅瓨鍦�");
+ }
+ 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;
@@ -141,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++) {
@@ -165,7 +182,6 @@
}else if (nodeType.equals("RGB(0,112,192)")) {
//杈撻�佺嚎
nodeData.put("type", "devp");
- nodeData.put("value", (int) Double.parseDouble(map.get("value").toString()));
}else if (nodeType.equals("RGB(0,176,240)")) {
//RGV
nodeData.put("type", "rgv");
@@ -186,10 +202,19 @@
}
dataList.add(arrayList);
}
+
+ 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);
}
-
-
- return R.ok().add(JSON.toJSONString(dataList));
+ return R.ok();
}
}
--
Gitblit v1.9.1