#

luxiaotao1123

2024-03-21 35ddd0428b9824fceb33d59811bf2c0022dd309e

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java

@@ -1,11 +1,14 @@
package com.zy.asrs.wcs.core.map.service;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.service.DictService;
import com.zy.asrs.wcs.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,13 +21,24 @@

    @Autowired
    private UserService userService;
    @Autowired
    private DictService dictService;

    public MapDataParam getMapData(MapQueryParam param, Long userId) {
        User user = userService.getById(userId);
        if (Cools.isEmpty(user.getMemo())) {
            return new MapDataParam();

        String dictFlag = "map-" + param.getFloor();
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, dictFlag));
        if (Cools.isEmpty(dict)) {
            return null;
        } else {
            return JSON.parseObject(dict.getValue(), MapDataParam.class) ;
        }
        return JSON.parseObject(user.getMemo(), MapDataParam.class);

//        User user = userService.getById(userId);
//        if (Cools.isEmpty(user.getMemo())) {
//            return new MapDataParam();
//        }
//        return JSON.parseObject(user.getMemo(), MapDataParam.class);
    }

    public void saveMapData(MapDataParam param, Long userId) {