From f140f8d9e17f4465f029134b008ec7f644b0e3db Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 14 十一月 2025 11:08:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 60d31e8..b45fedb 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -11,14 +11,20 @@
import com.zy.asrs.domain.vo.CrnLatestDataVo;
import com.zy.asrs.domain.vo.StationLatestDataVo;
import com.zy.asrs.entity.BasCrnpErr;
+import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasCrnpErrService;
+import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.common.model.MapNode;
+import com.zy.common.model.enums.NavigationMapType;
+import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StationProtocol;
@@ -34,7 +40,6 @@
/**
* 涓绘帶鍥炬帴鍙�
- * Created by vincent on 2020-06-01
*/
@Slf4j
@RestController
@@ -47,6 +52,10 @@
private WrkMastService wrkMastService;
@Autowired
private BasCrnpErrService basCrnpErrService;
+ @Autowired
+ private BasMapService basMapService;
+ @Autowired
+ private RedisUtil redisUtil;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -249,4 +258,32 @@
return R.ok().add(vo);
}
+ /**
+ * 鑾峰彇鍦板浘妤煎眰鏁版嵁
+ */
+ @GetMapping("/map/lev/list")
+ @ManagerAuth
+ public R getMapLevList() {
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ ArrayList<Integer> levList = new ArrayList<>();
+ for (BasMap basMap : basMaps) {
+ levList.add(basMap.getLev());
+ }
+ return R.ok().add(levList);
+ }
+
+ /**
+ * 鑾峰彇鍦板浘鏁版嵁
+ */
+ @GetMapping("/map/{lev}/auth")
+ @ManagerAuth
+ public R getMapFromRedis(@PathVariable Integer lev) {
+ Object data = redisUtil.get(RedisKeyType.MAP.key + lev);
+ if (data == null) {
+ return R.error();
+ }
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1