From 4c7e3f113b80e37c52163c30b80b9256f0bee5e3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 17 十一月 2025 13:34:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasMapController.java | 66 ++++++++++-----------------------
1 files changed, 20 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 9df3f27..2c91165 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -2,33 +2,24 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.BasMap;
-import com.zy.asrs.entity.BasShuttleCharge;
import com.zy.asrs.service.BasMapService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.service.BasShuttleChargeService;
import com.zy.asrs.utils.MapExcelUtils;
-import com.zy.common.model.MapNode;
import com.zy.common.utils.RedisUtil;
import com.zy.common.web.BaseController;
-import com.zy.core.enums.RedisKeyType;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFColor;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.util.*;
@@ -37,8 +28,6 @@
@Autowired
private BasMapService basMapService;
- @Autowired
- private BasShuttleChargeService basShuttleChargeService;
@Autowired
private RedisUtil redisUtil;
@@ -141,40 +130,18 @@
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());
+ }
+
@Autowired
private MapExcelUtils mapExcelUtils;
-
- @PostMapping("/basMap/upload")
- public R uploadExcel(@RequestParam("file") MultipartFile file) throws IOException {
- // 淇濆瓨涓婁紶鐨勬枃浠跺埌涓存椂浣嶇疆
- String tempFilePath = System.getProperty("java.io.tmpdir") + file.getOriginalFilename();
- file.transferTo(new File(tempFilePath));
-
- HashMap<Integer, List<List<HashMap<String, Object>>>> dataMap = mapExcelUtils.readExcel(tempFilePath);
- HashMap<Integer, List<List<MapNode>>> levMap = mapExcelUtils.processExcelData(dataMap);
-
- // 鍒犻櫎涓存椂鏂囦欢
- new File(tempFilePath).delete();
-
- basMapService.delete(new EntityWrapper<>());
-
- for (Map.Entry<Integer, List<List<MapNode>>> entry : levMap.entrySet()) {
- Integer lev = entry.getKey();
- List<List<MapNode>> map = entry.getValue();
-
- Date now = new Date();
- BasMap basMap = new BasMap();
- basMap.setLev(lev);
- basMap.setOriginData(JSON.toJSONString(map, SerializerFeature.DisableCircularReferenceDetect));
- basMap.setCreateTime(now);
- basMap.setUpdateTime(now);
- basMapService.insert(basMap);
-
- redisUtil.del(RedisKeyType.MAP.key + lev);
- }
-
- return R.ok();
- }
@PostMapping("/basMap/crn/upload")
public R uploadExcel2(@RequestParam("file") MultipartFile file) throws IOException {
@@ -208,7 +175,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");
@@ -231,8 +197,16 @@
}
}
-
- return R.ok().add(JSON.toJSONString(dataList));
+ BasMap basMap = basMapService.selectOne(new EntityWrapper<BasMap>().eq("lev", 1));
+ if (basMap == null){
+ basMap = new BasMap();
+ }
+ 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