#

taisheng

2025-02-25 69395e27cc6de6574c4df456f546054085aa933b

#

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -92,31 +92,7 @@
    @ManagerAuth
    public R resetMapToRedis() {
        for (int i = 1; i <= 10; i++) {//总共10层楼
            BasMap basMap = basMapService.selectLatestMap(i);
            //载入地图
            List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//获取完整地图(包括入库出库)
            if (basMap == null) {
                //数据库中也不存在地图数据，从地图文件中获取
                //存入数据库
                basMap = new BasMap();
                basMap.setData(JSON.toJSONString(lists));
                basMap.setCreateTime(new Date());
                basMap.setUpdateTime(new Date());
                basMap.setLev(i);

                if (!basMapService.insert(basMap)) {
                    log.info("地图数据存储失败");
                }
            }else {
                basMap.setData(JSON.toJSONString(lists));
                basMap.setUpdateTime(new Date());
                if (!basMapService.updateById(basMap)) {
                    log.info("地图数据存储失败");
                }
            }

            //将数据库地图数据存入redis
            redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
            redisUtil.del(RedisKeyType.MAP.key + i);
        }
        return R.ok();
    }
@@ -140,31 +116,7 @@
            return R.error("权限不足");
        }

        BasMap basMap = basMapService.selectLatestMap(lev);
        //载入地图
        List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//获取完整地图(包括入库出库)
        if (basMap == null) {
            //数据库中也不存在地图数据，从地图文件中获取
            //存入数据库
            basMap = new BasMap();
            basMap.setData(JSON.toJSONString(lists));
            basMap.setCreateTime(new Date());
            basMap.setUpdateTime(new Date());
            basMap.setLev(lev);

            if (!basMapService.insert(basMap)) {
                log.info("地图数据存储失败");
            }
        } else {
            basMap.setData(JSON.toJSONString(lists));
            basMap.setUpdateTime(new Date());
            if (!basMapService.updateById(basMap)) {
                log.info("地图数据存储失败");
            }
        }

        //将数据库地图数据存入redis
        redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
        redisUtil.del(RedisKeyType.MAP.key + lev);
        return R.ok();
    }


 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -82,23 +82,29 @@
        try {
            for (int i = 1; i <= 4; i++) {//总共四层楼
                Object data = redisUtil.get(RedisKeyType.MAP.key + i);
                if (data == null) {//redis地图数据为空，从数据库中获取
                if (data == null) {//redis地图数据为空
                    BasMap basMap = basMapService.selectLatestMap(i);
                    if (basMap == null) {
                        //数据库中也不存在地图数据，从地图文件中获取
                        basMap = new BasMap();
                        basMap.setCreateTime(new Date());
                        basMap.setUpdateTime(new Date());
                        basMap.setLev(i);
                        if (!basMapService.insert(basMap)) {
                            log.info("地图数据存储失败");
                        }
                    }

                        //载入地图
                        List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//获取完整地图(包括入库出库)

                        //存入数据库
                        basMap = new BasMap();
                        basMap.setData(JSON.toJSONString(lists));
                        basMap.setCreateTime(new Date());
                        basMap.setUpdateTime(new Date());
                        basMap.setLev(i);

                        if (!basMapService.insert(basMap)) {
                    if (!basMapService.updateById(basMap)) {
                            log.info("地图数据存储失败");
                        }
                    }

                    //将数据库地图数据存入redis

 src/main/resources/application.yml

@@ -19,7 +19,7 @@
  redis:
    host: 127.0.0.1
    port: 6379
    database: 0
    database: 6
#    password: 123456

mybatis-plus: