#

vincentlu

2025-12-12 6f945b2156b3c89e11eaf1496a40ee7d6f5978a2

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java

@@ -22,6 +22,7 @@
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.controller.result.MapAgvVo;
import com.zy.acs.manager.manager.controller.result.MapAreaResult;
import com.zy.acs.manager.manager.controller.result.MapPointVo;
import com.zy.acs.manager.manager.controller.result.MapRouteVo;
import com.zy.acs.manager.manager.entity.*;
@@ -432,8 +433,12 @@
    @PostMapping("/area/list")
    public R areaFetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
        List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>().eq(Area::getStatus, StatusType.ENABLE.val));

        return R.ok();
        List<MapAreaResult> list = new ArrayList<>();
        for (Area area : areaList) {
            MapAreaResult result = new MapAreaResult();
            list.add(result.sync(area));
        }
        return R.ok().add(list);
    }

    @PreAuthorize("hasAuthority('manager:loc:update')")

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java

New file
@@ -0,0 +1,52 @@
package com.zy.acs.manager.manager.controller.result;

import com.alibaba.fastjson.JSON;
import com.zy.acs.manager.common.domain.AreaShapeDto;
import com.zy.acs.manager.common.domain.MapPointDto;
import com.zy.acs.manager.manager.entity.Area;
import lombok.Data;

@Data
public class MapAreaResult {

    private Long id;

    private String name;

    private MapPointDto start;

    private MapPointDto end;

    private String color;

    private String code;

    private String type;

    private Integer maxCount;

    private String speedLimit;

    private Integer priority;

    private String memo;

    public MapAreaResult sync(Area area) {
        this.setId(area.getId());
        this.setName(area.getName());

        AreaShapeDto shapeDto = JSON.parseObject(area.getShapeData(), AreaShapeDto.class);
        this.setStart(shapeDto.getStart());
        this.setEnd(shapeDto.getEnd());

        this.setColor(color);
        this.setCode(area.getCode());
        this.setType(area.getType());
        this.setMaxCount(area.getMaxCount());
        this.setSpeedLimit(area.getSpeedLimit());
        this.setPriority(area.getPriority());
        this.setMemo(area.getMemo());
        return this;
    }

}