#

luxiaotao1123

2024-12-11 6589df387e83b8bdd0cfb8823cd277b94fedf0f0

#

 zy-acs-flow/src/map/insight/agv/AgvMain.jsx

@@ -187,7 +187,7 @@
                                <KeyValuePair label={translate('table.field.agvDetail.agvAngle')} value={info?.direction} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack.filter(item => item.loaded === true).length} />
                                <KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack?.filter(item => item.loaded === true).length} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agvDetail.error')} value={info?.error} />

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

@@ -1,12 +1,18 @@
package com.zy.acs.manager.core;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.core.service.*;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.core.utils.RouteGenerator;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.enums.TaskTypeType;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.FuncSta;
import com.zy.acs.manager.manager.enums.FuncStaType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.*;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +21,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * Created by vincent on 11/15/2024
@@ -53,6 +61,8 @@
    private PatrolService patrolService;
    @Autowired
    private RouteGenerator routeGenerator;
    @Autowired
    private FuncStaService funcStaService;

    @RequestMapping(value = "/system/info", method = {RequestMethod.GET, RequestMethod.POST})
    public R systemInfo() {
@@ -66,29 +76,55 @@
//        return R.ok(String.valueOf(list.size())).add(list);
//    }

    @GetMapping("/dead/lock")
    public R aaa() {
        AgvDetail agvDetail11 = agvDetailService.selectByAgvNo("11");
        agvDetail11.setCode(codeService.selectByData("00000251").getId());
        agvDetailService.updateById(agvDetail11);
    @GetMapping("/auto/go/standby")
    public R autoGoStandby() {

        AgvDetail agvDetail12 = agvDetailService.selectByAgvNo("12");
        agvDetail12.setCode(codeService.selectByData("00000204").getId());
        agvDetailService.updateById(agvDetail12);
        List<FuncSta> standbyFunStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>()
                .eq(FuncSta::getStatus, StatusType.ENABLE.val)
                .eq(FuncSta::getType, FuncStaType.STANDBY.toString())
                .orderByAsc(FuncSta::getId));

        AgvDetail agvDetail14 = agvDetailService.selectByAgvNo("14");
        agvDetail14.setCode(codeService.selectByData("00000101").getId());
        agvDetailService.updateById(agvDetail14);
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().orderByAsc(Agv::getId));

        for (int i = 0; i < standbyFunStaList.size(); i++) {

            FuncSta funcSta = standbyFunStaList.get(i);
            Code code = codeService.getById(funcSta.getCode());

            Agv agv = agvList.get(i);
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());

            agvDetail.setPos(1);
            agvDetail.setCode(code.getId());
            agvDetail.setStatus(AgvStatusType.IDLE.val);
            agvDetail.setAgvAngle(90D);
            agvDetail.setVol(5000);

            agvDetailService.updateById(agvDetail);
        }

        avoidWaveCalculator.calcDynamicNodeWhenBoot();


        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail14.getAgvId()), TaskTypeType.MOVE,
                codeService.selectByData("00000303").getData(), null);
        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail11.getAgvId()), TaskTypeType.MOVE,
                codeService.selectByData("00000411").getData(), null);
        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail12.getAgvId()), TaskTypeType.MOVE,
                codeService.selectByData("00000403").getData(), null);
//        AgvDetail agvDetail11 = agvDetailService.selectByAgvNo("11");
//        agvDetail11.setCode(codeService.selectByData("00000251").getId());
//        agvDetailService.updateById(agvDetail11);
//
//        AgvDetail agvDetail12 = agvDetailService.selectByAgvNo("12");
//        agvDetail12.setCode(codeService.selectByData("00000204").getId());
//        agvDetailService.updateById(agvDetail12);
//
//        AgvDetail agvDetail14 = agvDetailService.selectByAgvNo("14");
//        agvDetail14.setCode(codeService.selectByData("00000101").getId());
//        agvDetailService.updateById(agvDetail14);
//
//        avoidWaveCalculator.calcDynamicNodeWhenBoot();
//
//        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail14.getAgvId()), TaskTypeType.MOVE,
//                codeService.selectByData("00000303").getData(), null);
//        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail11.getAgvId()), TaskTypeType.MOVE,
//                codeService.selectByData("00000411").getData(), null);
//        mainLockWrapService.buildMinorTask(agvService.getById(agvDetail12.getAgvId()), TaskTypeType.MOVE,
//                codeService.selectByData("00000403").getData(), null);

        return R.ok();
    }

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

@@ -4,12 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.FuncSta;
import com.zy.acs.manager.manager.enums.FuncStaStateType;
import com.zy.acs.manager.manager.service.FuncStaService;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,9 @@
    @OperationLog("Create FuncSta")
    @PostMapping("/funcSta/save")
    public R save(@RequestBody FuncSta funcSta) {
        if (Cools.isEmpty(funcSta.getState())) {
            funcSta.setState(FuncStaStateType.IDLE.toString());
        }
        funcSta.setCreateBy(getLoginUserId());
        funcSta.setCreateTime(new Date());
        funcSta.setUpdateBy(getLoginUserId());