#

luxiaotao1123

2024-03-26 35b2e532ef54f40586a00698e2795f1c8d787af4

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

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.Optional;

/**
 * Created by vincent on 3/15/2024
@@ -26,26 +27,52 @@
    @Autowired
    private DictService dictService;

    public MapDataParam getMapData(MapQueryParam param, Long userId) {
    public String getMapFloorList(Long userId) {
        String floorKey = "map-floor-list";
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
        if (null == dict) {
            dict = new Dict();
            dict.setName(floorKey);
            dict.setFlag(floorKey);
            dict.setType(DictType.JSON.flag);
            dict.setValue("[\n" +
                    "    {\n" +
                    "        label: '1F',\n" +
                    "        value: 1\n" +
                    "    },\n" +
                    "    {\n" +
                    "        label: '2F',\n" +
                    "        value: 2\n" +
                    "    },\n" +
                    "    {\n" +
                    "        label: '3F',\n" +
                    "        value: 3\n" +
                    "    },\n" +
                    "    {\n" +
                    "        label: '4F',\n" +
                    "        value: 4\n" +
                    "    },\n" +
                    "    {\n" +
                    "        label: '5F',\n" +
                    "        value: 5\n" +
                    "    },\n" +
                    "]");
            dict.setCreateBy(userId);
            dict.setUpdateBy(userId);
            if (!dictService.save(dict)) {
                throw new CoolException("服务器内部错误");
            }
        }
        return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
    }

    public String getMapData(MapQueryParam param, Long userId) {
        String mapKey = getMapKey(param.getFloor());
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
        if (Cools.isEmpty(dict)) {
            return null;
        } else {
            return JSON.parseObject(dict.getValue(), MapDataParam.class) ;
        }


//        User user = userService.getById(userId);
//        if (Cools.isEmpty(user.getMemo())) {
//            return new MapDataParam();
//        }
//        return JSON.parseObject(user.getMemo(), MapDataParam.class);
        return Optional.ofNullable(dict).map(Dict::getValue).orElse(null);
    }

    public void saveMapData(MapDataParam param, Long userId) {

        String mapKey = getMapKey(param.getFloor());
        Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, mapKey));
        if (Cools.isEmpty(dict)) {
@@ -54,25 +81,20 @@
           dict.setFlag(mapKey);
           dict.setType(DictType.JSON.flag);
           dict.setValue(JSON.toJSONString(param.getItemList()));
           dict.setCreateBy(userId);
           dict.setUpdateBy(userId);
           if (!dictService.save(dict)) {
               throw new CoolException("服务器内部错误");
           }
        } else {
            dict.setValue(JSON.toJSONString(param.getItemList()));
            dict.setUpdateTime(new Date());
            dict.setUpdateBy(userId);
            if (!dictService.updateById(dict)) {
                throw new CoolException("服务器内部错误");
            }
        }

//
//        User user = userService.getById(userId);
//        user.setMemo(JSON.toJSONString(param));
//        if (!userService.updateById(user)) {
//            throw new CoolException("服务器内部错误");
//        }
    }


    private String getMapKey(Integer floor) {
        if (null != floor) {