#

luxiaotao1123

2024-11-09 555e2110078d566ae5a9914641bd1b3db2fa9e25

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java

@@ -11,6 +11,8 @@
@Data
public class MapWsAgvVo {

    private String agvModel;

    private String agvNo;

    private String code;

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataPatchScheduler.java

File was deleted

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java

@@ -8,8 +8,10 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.AgvDetailService;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.websocket.MapWebSocket;
@@ -33,6 +35,8 @@
    private AgvService agvService;
    @Autowired
    private AgvDetailService agvDetailService;
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private CodeService codeService;
    @Autowired
@@ -64,6 +68,7 @@
        );
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
            if (null == agvDetail) { continue; }
            Long recentCode = agvDetail.getRecentCode();
            if (null == recentCode) { continue; }
@@ -71,6 +76,7 @@
            if (null == code) { continue; }

            MapWsAgvVo vo = new MapWsAgvVo();
            vo.setAgvModel(agvModel.getType());
            vo.setAgvNo(agv.getUuid());
            vo.setCode(code.getData());
            vo.setDirection(agvDetail.getAgvAngle());

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/AgvModelType.java

New file
@@ -0,0 +1,29 @@
package com.zy.acs.manager.manager.enums;

import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.service.AgvModelService;

public enum AgvModelType {

    CTU_BOX_TRANSPORT_AGV,
    UNDERDRIVE_AGV,
    HEAVY_LOAD_STACKING_ROBOT,
    FORKLIFT_AGV,
    TOW_TRACTOR_AGV,
    ;

    AgvModelType() {
    }

    public long val() {
        AgvModelService service = SpringUtils.getBean(AgvModelService.class);
        AgvModel agvModel = service.selectByType(this.toString());
        if (agvModel == null) {
            throw new BusinessException("AgvModelType Error!");
        }
        return agvModel.getId();
    }

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java

@@ -5,4 +5,6 @@

public interface AgvModelService extends IService<AgvModel> {

    AgvModel selectByType(String type);

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java

@@ -1,5 +1,6 @@
package com.zy.acs.manager.manager.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.mapper.AgvModelMapper;
@@ -9,4 +10,9 @@
@Service("agvModelService")
public class AgvModelServiceImpl extends ServiceImpl<AgvModelMapper, AgvModel> implements AgvModelService {

    @Override
    public AgvModel selectByType(String type) {
        return this.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, type));
    }

}