#

vincentlu

4 天以前 027539e209365e0430573052d627697e9b9d8446

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java

@@ -1,6 +1,8 @@
package com.zy.acs.manager.core;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.domain.HeightDepthDto;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.integrate.conveyor.ConveyorStationService;
@@ -9,16 +11,17 @@
import com.zy.acs.manager.core.service.PatrolService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.FuncStaType;
import com.zy.acs.manager.manager.enums.StaReserveType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
@@ -44,10 +47,14 @@
    private AgvModelService agvModelService;
    @Autowired
    private StaService staService;
    @Autowired
    private SegmentService segmentService;
//    @Autowired
//    private ConveyorStationService siemensConveyorStationService;
    @Autowired
    private ConveyorStationService siemensConveyorStationService;
    @Autowired
    private ConfigService configService;

    @RequestMapping(value = "/system/info", method = {RequestMethod.GET, RequestMethod.POST})
    public R systemInfo() {
@@ -56,9 +63,12 @@

    @RequestMapping(value = "/system/demo", method = {RequestMethod.GET, RequestMethod.POST})
    public R demo() {
        Sta sta = staService.selectByStaNo("1006");
        boolean b = siemensConveyorStationService.allowAgvWork(sta, null, null, StaReserveType.IN);
        return R.ok().add(b);
        Double defaultShelfDepth = configService.getVal("defaultShelfDepth", Double.class);

        defaultShelfDepth = Optional.ofNullable(defaultShelfDepth).orElse((double) 0);
        Double ss = 10.0;
        String jsonString = JSON.toJSONString(new HeightDepthDto(ss, defaultShelfDepth));
        return R.ok(jsonString);
    }

    // http://localhost:8088/demo/auto/go/standby
@@ -151,8 +161,6 @@

    @Autowired
    private MapService mapService;
    @Autowired
    private SegmentService segmentService;

    @GetMapping("/astarDemo") // astar spend time: 3866, count:3855
    public R astarDemo() {