#

Junjie

2023-12-01 d500950add4a43fbd02135a5cb59de0493a8261a

#

 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 = "系统运行状态")
@@ -412,7 +418,20 @@
     */
    @GetMapping("/map/resetMap/{lev}")
    @ManagerAuth(memo = "重置Redis地图")
    public R resetMapToRedisByLev(@PathVariable Integer lev) {
    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);
@@ -429,7 +448,7 @@
            if (!basMapService.insert(basMap)) {
                log.info("地图数据存储失败");
            }
        }else {
        } else {
            basMap.setData(JSON.toJSONString(lists));
            basMap.setUpdateTime(new Date());
            if (!basMapService.updateById(basMap)) {

 src/main/webapp/views/console1.html

@@ -655,10 +655,17 @@
                            data:{},
                            method:'get',
                            success:function (res) {
                                that.$message({
                                    message: that.currentLev + '层地图重置完成',
                                    type: 'success'
                                });
                                if (res.code === 200) {
                                    that.$message({
                                        message: that.currentLev + '层地图重置完成',
                                        type: 'success'
                                    });
                                }else {
                                    that.$message({
                                        message: res.msg,
                                        type: 'error'
                                    });
                                }
                            }
                        })
                    },