From 3b64c807f60e5d6b71deca3f79c9be4be19abfaa Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 23 二月 2024 10:47:58 +0800
Subject: [PATCH] #显示器更新
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 3c08969..f450cd2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
+import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
@@ -19,6 +20,7 @@
import com.zy.common.CodeRes;
import com.zy.common.model.MapNode;
import com.zy.common.model.enums.NavigationMapType;
+import com.zy.common.utils.Http;
import com.zy.common.utils.NavigateMapData;
import com.zy.common.utils.RedisUtil;
import com.zy.core.CrnThread;
@@ -40,8 +42,10 @@
import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -69,6 +73,8 @@
private LocMastMapper locMastMapper;
@Autowired
private RedisUtil redisUtil;
+ @Value("${super.pwd}")
+ private String superPwd;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -411,7 +417,21 @@
* 閲嶇疆redis涓殑鍦板浘锛屽皢鍗犵敤鐨勫簱浣嶅叏閮ㄨВ闄�
*/
@GetMapping("/map/resetMap/{lev}")
- public R resetMapToRedisByLev(@PathVariable Integer lev) {
+ @ManagerAuth(memo = "閲嶇疆Redis鍦板浘")
+ public R resetMapToRedisByLev(@PathVariable Integer lev, HttpServletRequest request) {
+ // super璐﹀彿
+ String token = request.getHeader("token");
+ if (token == null) {
+ return R.error();
+ }
+ String deToken = Cools.deTokn(token, superPwd);
+ if (deToken == null) {
+ return R.error("鏉冮檺涓嶈冻");
+ }
+ if (!"super".equals(deToken.substring(13))) {
+ return R.error("鏉冮檺涓嶈冻");
+ }
+
BasMap basMap = basMapService.selectLatestMap(lev);
//杞藉叆鍦板浘
NavigateMapData mapData = new NavigateMapData(lev);
@@ -428,7 +448,7 @@
if (!basMapService.insert(basMap)) {
log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
}
- }else {
+ } else {
basMap.setData(JSON.toJSONString(lists));
basMap.setUpdateTime(new Date());
if (!basMapService.updateById(basMap)) {
--
Gitblit v1.9.1