#

Junjie

2025-07-03 91573a133dad2c62463a941aafc671df17370047

#

 src/main/java/com/zy/asrs/controller/ApiLogController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasDevpController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasLiftController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasLiftErrController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasLiftErrLogController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasLiftOptController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasLocStsController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasMapController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasPlcerrorController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasShuttleChargeController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasShuttleController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasShuttleErrController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasShuttleOptController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java

File was deleted

 src/main/java/com/zy/asrs/controller/BasWrkStatusController.java

File was deleted

 src/main/java/com/zy/asrs/controller/ConsoleController.java

File was deleted

 src/main/java/com/zy/asrs/controller/DeviceMsgController.java

File was deleted

 src/main/java/com/zy/asrs/controller/ForkLiftController.java

File was deleted

 src/main/java/com/zy/asrs/controller/LocMastController.java

File was deleted

 src/main/java/com/zy/asrs/controller/NewsController.java

File was deleted

 src/main/java/com/zy/asrs/controller/OpenController.java

File was deleted

 src/main/java/com/zy/asrs/controller/ShuttleController.java

File was deleted

 src/main/java/com/zy/asrs/controller/WrkLastnoController.java

File was deleted

 src/main/java/com/zy/asrs/controller/WrkMastController.java

File was deleted

 src/main/java/com/zy/asrs/controller/WrkMastLogController.java

File was deleted

 src/main/java/com/zy/asrs/domain/ShuttleGatherResult.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CancelTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CompleteTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CreateInTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CreateLocMoveTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CreateMoveTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/CreateOutTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/DeviceMsgPutParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/GetLocInformationParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/LiftOperatorParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/QueryTaskParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/ReportExceptionParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/RobotReportActionStatusParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/ShuttleGatherParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/ShuttleOperatorParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/ShuttleTimedPowerRangeParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/LiftDataVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/LiftMsgTableVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/LiftSensorDataVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/LiftStateTableVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/ShuttleDataVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/ShuttleSensorDataVo.java

File was deleted

 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java

File was deleted

 src/main/java/com/zy/asrs/entity/ApiLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasDevp.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasLift.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasLiftErr.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasLiftErrLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasLiftOpt.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasLocSts.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasMap.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasPlcerror.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasShuttle.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasShuttleCharge.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasShuttleErr.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasShuttleErrLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasShuttleOpt.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasWrkIotype.java

File was deleted

 src/main/java/com/zy/asrs/entity/BasWrkStatus.java

File was deleted

 src/main/java/com/zy/asrs/entity/DeviceDataLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/HttpRequestLog.java

File was deleted

 src/main/java/com/zy/asrs/entity/LocMast.java

File was deleted

 src/main/java/com/zy/asrs/entity/RowLastno.java

File was deleted

 src/main/java/com/zy/asrs/entity/StaDesc.java

File was deleted

 src/main/java/com/zy/asrs/entity/WrkLastno.java

File was deleted

 src/main/java/com/zy/asrs/entity/WrkMast.java

File was deleted

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

File was deleted

 src/main/java/com/zy/asrs/mapper/ApiLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasDevpMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasLiftErrLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasLiftErrMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasLiftMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasMapMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasShuttleChargeMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasShuttleErrLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasShuttleErrMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasShuttleMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/HttpRequestLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/StaDescMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java

File was deleted

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

File was deleted

 src/main/java/com/zy/asrs/service/ApiLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasDevpService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasLiftErrLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasLiftErrService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasLiftOptService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasLiftService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasLocStsService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasMapService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasPlcerrorService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasShuttleChargeService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasShuttleErrLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasShuttleErrService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasShuttleOptService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasShuttleService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasWrkIotypeService.java

File was deleted

 src/main/java/com/zy/asrs/service/BasWrkStatusService.java

File was deleted

 src/main/java/com/zy/asrs/service/DeviceDataLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/HttpRequestLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/LocMastService.java

File was deleted

 src/main/java/com/zy/asrs/service/MainService.java

File was deleted

 src/main/java/com/zy/asrs/service/RowLastnoService.java

File was deleted

 src/main/java/com/zy/asrs/service/StaDescService.java

File was deleted

 src/main/java/com/zy/asrs/service/WrkLastnoService.java

File was deleted

 src/main/java/com/zy/asrs/service/WrkMastLogService.java

File was deleted

 src/main/java/com/zy/asrs/service/WrkMastService.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasLiftErrLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasLiftErrServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasLiftServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasMapServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasShuttleChargeServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasShuttleErrLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasShuttleErrServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasShuttleOptServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasShuttleServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasWrkIotypeServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/BasWrkStatusServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/HttpRequestLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

File was deleted

 src/main/java/com/zy/asrs/task/ClearDeviceDataLogScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/NotifyScheduler.java

@@ -4,8 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.NotifyDto;
import com.zy.asrs.entity.HttpRequestLog;
import com.zy.asrs.service.HttpRequestLogService;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
@@ -35,8 +33,6 @@
    private SlaveProperties slaveProperties;
    @Autowired
    private ConfigService configService;
    @Autowired
    private HttpRequestLogService httpRequestLogService;

    @Scheduled(cron = "0/3 * * * * ? ")
    public synchronized void notifyShuttle(){
@@ -99,10 +95,10 @@
                continue;
            }

            HttpRequestLog httpRequestLog = new HttpRequestLog();
            httpRequestLog.setName(notifyUri + notifyUriPath);
            httpRequestLog.setRequest(JSON.toJSONString(notifyDto));
            httpRequestLog.setCreateTime(new Date());
//            HttpRequestLog httpRequestLog = new HttpRequestLog();
//            httpRequestLog.setName(notifyUri + notifyUriPath);
//            httpRequestLog.setRequest(JSON.toJSONString(notifyDto));
//            httpRequestLog.setCreateTime(new Date());

            try {
                //触发通知
@@ -112,7 +108,7 @@
                        .setJson(JSON.toJSONString(notifyDto))
                        .build()
                        .doPost();
                httpRequestLog.setResponse(response);
//                httpRequestLog.setResponse(response);

                JSONObject jsonObject = JSON.parseObject(response);
                Integer code = jsonObject.getInteger("code");
@@ -126,7 +122,7 @@
                e.printStackTrace();
            }finally {
                //保存记录
                httpRequestLogService.insert(httpRequestLog);
//                httpRequestLogService.insert(httpRequestLog);
            }

            //通知失败

 src/main/java/com/zy/asrs/task/RealtimeBasMapScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/ShuttleChargePowerScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/ShuttlePowerEarlyWarning.java

File was deleted

 src/main/java/com/zy/asrs/task/WrkMastScheduler.java

File was deleted

 src/main/java/com/zy/asrs/utils/Utils.java

File was deleted

 src/main/java/com/zy/asrs/ws/ConsoleWebSocket.java

File was deleted

 src/main/java/com/zy/asrs/ws/ShuttleWebSocket.java

File was deleted

 src/main/java/com/zy/common/model/MapNode.java

File was deleted

 src/main/java/com/zy/common/model/MatDto.java

File was deleted

 src/main/java/com/zy/common/model/NavigateNode.java

File was deleted

 src/main/java/com/zy/common/model/SearchLocParam.java

File was deleted

 src/main/java/com/zy/common/model/ShuttleOperaResult.java

File was deleted

 src/main/java/com/zy/common/model/StartupDto.java

File was deleted

 src/main/java/com/zy/common/model/WebSocketMessage.java

File was deleted

 src/main/java/com/zy/common/service/CommonService.java

File was deleted

 src/main/java/com/zy/common/utils/ForkLiftOperaUtils.java

File was deleted

 src/main/java/com/zy/common/utils/ForkLiftUtils.java

File was deleted

 src/main/java/com/zy/common/utils/NavigateMapData.java

File was deleted

 src/main/java/com/zy/common/utils/NavigateMapUtils.java

File was deleted

 src/main/java/com/zy/common/utils/NavigatePositionConvert.java

File was deleted

 src/main/java/com/zy/common/utils/NavigateSolution.java

File was deleted

 src/main/java/com/zy/common/utils/NavigateUtils.java

File was deleted

 src/main/java/com/zy/common/utils/RobotUtils.java

File was deleted

 src/main/java/com/zy/common/utils/ShuttleOperaUtils.java

File was deleted

 src/main/java/com/zy/core/MainProcess.java

File was deleted

 src/main/java/com/zy/core/News.java

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

import com.core.common.SpringUtils;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import lombok.extern.slf4j.Slf4j;

import java.lang.reflect.Array;
@@ -112,21 +110,6 @@
        offer(NewsLevel.ERROR, format, arguments);
    }

    public static void taskInfo(Integer wrkNo, String format, Object... arguments) {
        info(format, arguments);
        offerTask(wrkNo, format, arguments);
    }

    public static void taskWarn(Integer wrkNo, String format, Object... arguments) {
        warn(format, arguments);
        offerTask(wrkNo, format, arguments);
    }

    public static void taskError(Integer wrkNo, String format, Object... arguments) {
        error(format, arguments);
        offerTask(wrkNo, format, arguments);
    }

    public static String printStr() {
        StringBuilder sb = new StringBuilder("[");
        List<NewsDomain> domains = NEWS_QUEUE.data();
@@ -155,25 +138,6 @@
            res.add(map);
        }
        return res;
    }

    private static boolean offerTask(Integer wrkNo, String msg, Object[] args) {
        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
        if (wrkMastService == null) {
            return false;
        }

        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        if (wrkMast == null) {
            return false;
        }
        String systemMsg = replace(msg, args);
        if (!systemMsg.equals(wrkMast.getSystemMsg())) {
            wrkMast.setSystemMsg(systemMsg);
            wrkMast.setModiTime(new Date());
            wrkMastService.updateById(wrkMast);
        }
        return true;
    }

    private static boolean offer(NewsLevel level, String msg, Object[] args) {

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -9,9 +9,7 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import com.zy.core.thread.impl.LfdZyForkLiftMasterThread;
import com.zy.core.thread.impl.LfdZyForkLiftSlaveThread;
import com.zy.core.thread.impl.NyShuttleThread;
import com.zy.core.thread.impl.ZyForkLiftThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -30,8 +28,6 @@
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private MainProcess mainProcess;
    @Autowired
    private RedisUtil redisUtil;


@@ -44,8 +40,6 @@
        initMq();
        // åˆå§‹åŒ–下位机线程
        initThread();
        // å¼€å§‹ä¸»æµç¨‹è¿›ç¨‹
        mainProcess.start();
        News.info("核心控制层已启动...............................................");
    }

@@ -61,22 +55,6 @@
    }

    private void initThread(){
        // åˆå§‹åŒ–货叉提升机
        for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
            News.info("初始化货叉提升机........................................................");
            ThreadHandler thread = null;
            if (forkLiftSlave.getThreadImpl().equals("ZyForkLiftThread")) {
                thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
            } else if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftSlaveThread")) {
                thread = new LfdZyForkLiftSlaveThread(forkLiftSlave, redisUtil, forkLiftSlave.getMasterId());
            } else {
                throw new CoolException("未知的线程实现");
            }

            new Thread(thread).start();
            SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
        }

        // åˆå§‹åŒ–货叉提升机
        for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLiftMaster()) {
            News.info("初始化货叉提升机Master........................................................");

 src/main/java/com/zy/core/action/ForkLiftAction.java

File was deleted

 src/main/java/com/zy/core/action/ShuttleAction.java

File was deleted

 src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java

File was deleted

 src/main/java/com/zy/core/model/PythonResult.java

File was deleted

 src/main/java/com/zy/core/model/PythonSimilarityResult.java

File was deleted

 src/main/java/com/zy/core/model/command/ForkLiftCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/LiftAssignCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/LiftCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/LiftRedisCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/NyShuttleHttpCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/ShuttleAssignCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/ShuttleCommand.java

File was deleted

 src/main/java/com/zy/core/model/command/ShuttleRedisCommand.java

File was deleted

 src/main/java/com/zy/core/model/param/ShuttleMoveLocParam.java

File was deleted

 src/main/java/com/zy/core/model/protocol/ForkLiftProtocol.java

File was deleted

 src/main/java/com/zy/core/model/protocol/ForkLiftStaProtocol.java

File was deleted

 src/main/java/com/zy/core/model/protocol/LiftStaProtocol.java

File was deleted

 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java

File was deleted

 src/main/java/com/zy/core/thread/ForkLiftThread.java

@@ -1,53 +1,7 @@
package com.zy.core.thread;

import com.zy.common.ExecuteSupport;
import com.zy.core.ThreadHandler;
import com.zy.core.enums.ForkLiftIoModeType;
import com.zy.core.enums.ForkLiftProtocolStatusType;
import com.zy.core.enums.ForkLiftTaskModeType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.ForkLiftCommand;
import com.zy.core.model.protocol.ForkLiftProtocol;
import com.zy.core.model.protocol.ForkLiftStaProtocol;

import java.util.List;

public interface ForkLiftThread extends ThreadHandler {

    ForkLiftProtocol getStatus();//获取提升机状态

    ForkLiftProtocol getStatus(boolean clone);//获取提升机状态

    List<ForkLiftStaProtocol> getForkLiftStaProtocols();

    CommandResponse pickAndPut(ForkLiftCommand command);//取放货指令

    CommandResponse shuttleSwitch(ForkLiftCommand command);//小车换层

    CommandResponse move(ForkLiftCommand command);//小车换层

    CommandResponse reset();//复位

    boolean isIdle();//是否空闲

    boolean isDeviceIdle();//设备是否空闲

    boolean isDeviceIdle(ExecuteSupport support);//设备是否空闲

    boolean setProtocolStatus(ForkLiftProtocolStatusType status);//设置工作状态

    boolean setSyncTaskNo(Integer taskNo);//设置工作号

    boolean switchIOMode(ForkLiftIoModeType type);//切换出入库模式

    int generateDeviceTaskNo(int taskNo, ForkLiftTaskModeType type);//生成硬件设备工作号

    //***************获取命令*****************

    List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put);//取放货指令

    List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put);//小车换层

    List<ForkLiftCommand> getMoveCommand(Integer taskNo, Integer pick, Integer put);//提升机移动

}

 src/main/java/com/zy/core/thread/ShuttleThread.java

@@ -1,80 +1,7 @@
package com.zy.core.thread;


import com.zy.common.ExecuteSupport;
import com.zy.common.model.NavigateNode;
import com.zy.core.ThreadHandler;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleTaskNoType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.param.ShuttleMoveLocParam;
import com.zy.core.model.protocol.ShuttleProtocol;

import java.util.List;

public interface ShuttleThread extends ThreadHandler {

    ShuttleProtocol getStatus(boolean clone);//获取四向穿梭车状态

    ShuttleProtocol getStatus();//获取四向穿梭车状态-默认clone

    CommandResponse movePath(List<NavigateNode> nodes, Integer taskNo);//路径下发

    CommandResponse move(ShuttleCommand command);//移动

    CommandResponse lift(ShuttleCommand command);//顶升

    CommandResponse charge(ShuttleCommand command);//充电开关

    CommandResponse reset(ShuttleCommand command);//复位开关

    CommandResponse updateLocation(ShuttleCommand command);//更新坐标

    boolean isIdle();

    boolean isIdle(ExecuteSupport support);//是否空闲

    boolean isDeviceIdle();//设备是否空闲

    boolean isDeviceIdle(ExecuteSupport support);//设备是否空闲

    boolean isRequireCharge();//是否满足充电状态

    boolean isCharging();//是否充电中

    boolean isChargingCompleted();//是否充电完成

    boolean isFault();//是否故障

    List<NavigateNode> getMoveAdvancePath();//获取穿梭车任务路径

    int generateDeviceTaskNo(int taskNo, ShuttleTaskNoType type);//生成硬件设备工作号

    boolean setProtocolStatus(ShuttleProtocolStatusType status);//设置工作状态

    boolean setTaskNo(Integer taskNo);//设置工作号

    boolean setSyncTaskNo(Integer taskNo);//设置工作号

    boolean setPakMk(boolean pakMk);//设置标记

    boolean enableMoveLoc(ShuttleMoveLocParam param, boolean enable);

    boolean requestWaiting();

    boolean enableDemo(boolean enable);//演示模式

    boolean offerSystemMsg(String format, Object... arguments);

    //***************获取命令*****************

    ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes);//获取移动命令

    ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift);//顶升命令 true=>顶升 false=>下降

    ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge);//充电开关命令 true=>开 false=>关

    ShuttleCommand getUpdateLocationCommand(Integer taskNo, String locNo);//获取更新坐标命令

}

 src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java

@@ -10,7 +10,6 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.protocol.ForkLiftProtocol;
import lombok.extern.slf4j.Slf4j;

import java.text.MessageFormat;
@@ -24,7 +23,6 @@
public class LfdZyForkLiftMasterThread implements ThreadHandler {

    private ForkLiftSlave slave;
    private ForkLiftProtocol forkLiftProtocol;
    private RedisUtil redisUtil;
    private SiemensS7Net siemensS7Net;
    private List<HashMap<String,Object>> slaveAddressList = null;

 src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java

File was deleted

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -2,46 +2,20 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.ExecuteSupport;
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.utils.NavigateMapData;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.Utils.DeviceMsgUtils;
import com.zy.core.action.ShuttleAction;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.*;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.DeviceMsgModel;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.NyShuttleHttpCommand;
import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.command.ShuttleRedisCommand;
import com.zy.core.model.param.ShuttleMoveLocParam;
import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.thread.ShuttleThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.InetAddress;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.*;

@@ -51,15 +25,12 @@

    private ShuttleSlave slave;
    private RedisUtil redisUtil;
    private ShuttleProtocol shuttleProtocol;
    private Socket socket;

    private static final boolean DEBUG = false;//调试模式

    private List<JSONObject> socketReadResults = new ArrayList<>();
    private List<JSONObject> socketResults = new ArrayList<>();

    //原始设备数据
    private Object originDeviceData;

    public NyShuttleThread(ShuttleSlave slave, RedisUtil redisUtil) {
        this.slave = slave;
@@ -69,108 +40,76 @@
    @Override
    public void run() {
        News.info("{}号四向车线程启动", slave.getId());
        this.connect();

        //设备读取
        Thread readThread = new Thread(() -> {
        //监听消息并存储
        Thread innerThread = new Thread(() -> {
            while (true) {
                try {
                    listenMessageFromRedis();
                    listenInit();//监听初始化事件
                    read();
                    Thread.sleep(50);
                } catch (Exception e) {
                    log.error("ShuttleThread Fail", e);
                }
            }
        });
        readThread.start();

        //设备执行
        Thread executeThread = new Thread(() -> {
            while (true) {
                try {
                    ShuttleAction shuttleAction = SpringUtils.getBean(ShuttleAction.class);
                    if (shuttleAction == null) {
                        continue;
                    }

                    Object object = redisUtil.get(RedisKeyType.SHUTTLE_FLAG.key + slave.getId());
                    if (object == null) {
                        continue;
                    }

                    Integer taskNo = Integer.valueOf(String.valueOf(object));
                    if (taskNo != 0) {
                        //存在任务需要执行
                        boolean result = shuttleAction.executeWork(slave.getId(), taskNo);
                    }

//                    //小车空闲且有跑库程序
//                    shuttleAction.moveLoc(slave.getId());

                    //演示模式
                    shuttleAction.demo(slave.getId());

                    Thread.sleep(200);
                    listenSocketMessage();
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        });
        executeThread.start();
        innerThread.start();

        //其他任务
        Thread otherThread = new Thread(() -> {
            while (true) {
                try {
                    saveLog();//保存数据
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        });
        otherThread.start();
//        //设备执行
//        Thread executeThread = new Thread(() -> {
//            while (true) {
//                try {
//                    ShuttleAction shuttleAction = SpringUtils.getBean(ShuttleAction.class);
//                    if (shuttleAction == null) {
//                        continue;
//                    }
//
//                    Object object = redisUtil.get(RedisKeyType.SHUTTLE_FLAG.key + slave.getId());
//                    if (object == null) {
//                        continue;
//                    }
//
//                    Integer taskNo = Integer.valueOf(String.valueOf(object));
//                    if (taskNo != 0) {
//                        //存在任务需要执行
//                        boolean result = shuttleAction.executeWork(slave.getId(), taskNo);
//                    }
//
////                    //小车空闲且有跑库程序
////                    shuttleAction.moveLoc(slave.getId());
//
//                    //演示模式
//                    shuttleAction.demo(slave.getId());
//
//                    Thread.sleep(200);
//                } catch (Exception e) {
//                    e.printStackTrace();
//                }
//            }
//        });
//        executeThread.start();
    }

    private void saveLog() {
        if (shuttleProtocol == null) {
            return;
        }

        if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 5) {
            if (this.originDeviceData != null) {
                //采集时间超过5s，保存一次数据记录
                //保存数据记录
                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                if (deviceDataLogService == null) {
                    return;
                }
                DeviceDataLog deviceDataLog = new DeviceDataLog();
                deviceDataLog.setOriginData(JSON.toJSONString(this.originDeviceData));
                deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
                deviceDataLog.setType(String.valueOf(SlaveType.Shuttle));
                deviceDataLog.setDeviceNo(slave.getId());
                deviceDataLog.setCreateTime(new Date());
                deviceDataLogService.insert(deviceDataLog);

                //更新采集时间
                shuttleProtocol.setDeviceDataLog(System.currentTimeMillis());
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< å®žæ—¶æ•°æ®æ›´æ–°æˆåŠŸ",DateUtils.convert(new Date()), slave.getId()));
            }
        }
    }

    private void listenMessageFromRedis() {
    private void listenSocketMessage() {
        try {
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            if (deviceMsgUtils == null) {
            if (this.socket == null) {
                return;
            }
            DeviceMsgModel deviceMsg = deviceMsgUtils.getDeviceMsg(SlaveType.Shuttle, slave.getId());
            if(deviceMsg == null){
                return;

            // èŽ·å–输入流
            BufferedReader reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
            // è¯»å–服务器的响应
            StringBuffer sb = new StringBuffer();
            char[] chars = new char[2048];//缓冲区
            while (true) {
                reader.read(chars);
                String trim = new String(chars);
                sb.append(trim);
                if (trim.lastIndexOf("\r\n") != -1) {
                    break;
                }
            }
            JSONObject result = JSON.parseObject(deviceMsg.getDeviceMsg().toString());//得到响应结果集

            JSONObject result = JSON.parseObject(sb.toString());//得到响应结果集

            String msgType = result.getString("msgType");
            if ("responseMsg".equals(msgType)) {
@@ -192,840 +131,69 @@
        }
    }

    public JSONObject getRequestBody(String type, String taskId) {
        try {
            // èŽ·å–服务器响应
            JSONObject result = null;
            if (type.equals("readState")) {
                type = "state";
            }

            for (int i = 0; i < socketResults.size(); i++) {
                JSONObject socketResult = socketResults.get(i);
                if (!socketResult.get("msgType").equals("responseMsg")) {//不是响应内容
                    continue;
                }

                JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
                JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
                String responseType = resultBody.get("responseType").toString();
                if (DEBUG) {
                    result = socketResult;
                    break;
                }

                if (!responseType.equals(type)) {
                    continue;//响应类型与请求类型不一致，不在调试模式下
                }

                if (taskId != null) {
                    String responseTaskId = resultBody.get("taskId").toString();
                    if (!responseTaskId.equals(taskId)) {
                        continue;//响应ID与请求ID不一致，不在调试模式下
                    }
                }

                result = socketResult;
                break;
            }

            if (result == null) {
                return null;//无响应结果
            }

            return filterBodyData(result);//返回Body结果集
        } catch (Exception e) {
            return null;
        }
    }

    private void read() {
        try {
            readStatus();
        } catch (Exception e) {
            e.printStackTrace();
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】读取四向穿梭车状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
        }
    }

    private void readStatus() {
        try {
            if (null == shuttleProtocol) {
                shuttleProtocol = new ShuttleProtocol();
                shuttleProtocol.setShuttleNo(slave.getId());
                shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);

                InnerSuhttleExtend extend = new InnerSuhttleExtend();
                shuttleProtocol.setExtend(extend);
            }

            if (this.socketReadResults.isEmpty()) {
                if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60) {
                    //最后一次上线时间超过60s，认定离线
                    this.shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                }
                return;
            }

            JSONObject data = this.socketReadResults.get(0);
            this.socketReadResults.remove(0);
            if (data == null) {
                if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60) {
                    //最后一次上线时间超过60s，认定离线
                    this.shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                }
                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            }else {

                //----------读取四向穿梭车状态-----------
                //小车设备状态
                shuttleProtocol.setDeviceStatus(data.getInteger("free"));
                //小车模式
                shuttleProtocol.setMode(data.getInteger("workingMode"));
                //当前二维码
                shuttleProtocol.setCurrentCode(data.getString("point"));
                //电池电量
                shuttleProtocol.setBatteryPower(data.getString("powerPercent"));
                //电池电压
                shuttleProtocol.setBatteryVoltage(data.getInteger("voltage"));
                //故障
                shuttleProtocol.setErrorCode(data.getJSONArray("errCode").getString(0));

                //是否顶升
                shuttleProtocol.setHasLift(data.getInteger("liftPosition") == 2 ? true : false);
                //是否有托盘
                shuttleProtocol.setHasPallet(data.getInteger("loadState") == 1 ? true : false);
                //行驶方向
                shuttleProtocol.setRunDirection(data.getString("runDir") == null ? "none" : data.getString("runDir"));
                //是否为充电状态
                shuttleProtocol.setHasCharge(data.getInteger("chargState") == 1 ? true : false);
                //运行速度
                shuttleProtocol.setSpeed(data.getInteger("speed"));

                //*********读取扩展字段**********
                InnerSuhttleExtend extend = (InnerSuhttleExtend) shuttleProtocol.getExtend();
                //管制状态
                extend.setSuspendState(data.getInteger("suspendState"));
                //最高电芯电压(mV)
                extend.setMaxCellVoltage(data.getInteger("maxCellVoltage"));
                //最低电芯电压(mV)
                extend.setMinCellVoltage(data.getInteger("minCellVoltage"));
                //电池电压
                extend.setVoltage(data.getInteger("voltage"));
                //充放电循环次数
                extend.setChargeCycleTimes(data.getInteger("chargeCycleTimes"));
                //剩余电量
                extend.setSurplusQuantity(data.getInteger("surplusQuantity"));
                //总电量
                extend.setCountQuantity(data.getInteger("countQuantity"));
                shuttleProtocol.setExtend(extend);//扩展字段

                //最近一次在线时间
                shuttleProtocol.setLastOnlineTime(System.currentTimeMillis());
                ///读取四向穿梭车状态-end

                //小车处于运行中，将标记置为true
                if (shuttleProtocol.getDeviceStatus() == 0) {
                    shuttleProtocol.setPakMk(true);
                }

                if (shuttleProtocol.getProtocolStatusType() == null && shuttleProtocol.getDeviceStatus().intValue() == 1) {
                    //小车空闲状态、小车任务状态为未知，认定曾离线过，需要复位成空闲
                    this.shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                }

                if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE) && shuttleProtocol.getDeviceStatus().intValue() == 1) {
                    this.shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                }

                this.originDeviceData = data;

                OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< å®žæ—¶æ•°æ®æ›´æ–°æˆåŠŸ",DateUtils.convert(new Date()), slave.getId()));
            }
        } catch (Exception e) {
            e.printStackTrace();
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
        }
    }

    /**
     * ç›‘听小车复位初始化信号
     */
    public void listenInit() {
        try {
            // èŽ·å–服务器响应
            JSONObject result = null;
            int removeIdx = -1;
            for (int i = 0; i < socketResults.size(); i++) {
                JSONObject socketResult = socketResults.get(i);
                if (socketResult == null) {
                    continue;
                }
                if (!socketResult.get("msgType").equals("requestMsg")) {//不是请求内容
                    continue;
                }

                JSONObject resultResponse = JSON.parseObject(socketResult.get("request").toString());
                JSONObject resultHeader = JSON.parseObject(resultResponse.get("header").toString());
                JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
                String requestType = resultBody.getString("requestType");
                Integer requestId = resultHeader.getInteger("requestId");
                if (requestType.equals("init")) {
                    removeIdx = i;//此数据已经处理，从结果集中剔除
                    socketResults.remove(removeIdx);

                    Integer code = resultBody.getInteger("code");
                    //小车复位请求
                    ShuttleCommand initCommand = getInitCommand(requestId, code);
                    //发出请求
                    NyShuttleHttpCommand httpCommand = JSON.parseObject(initCommand.getBody(), NyShuttleHttpCommand.class);
                    JSONObject requestResult = requestCommand(httpCommand);

                    log.info(MessageFormat.format("【{0}】四向车复位上报 ===>> [code:{1}] [ip:{2}] [port:{3}]", slave.getId(), code, slave.getIp(), slave.getPort()));
                    OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向车复位上报 ===>> [code:{1}] [ip:{2}] [port:{3}]", slave.getId(), code, slave.getIp(), slave.getPort()));
                    break;
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    @Override
    public ShuttleProtocol getStatus() {
        return getStatus(true);
    }

    @Override
    public ShuttleProtocol getStatus(boolean clone) {
        if (this.shuttleProtocol == null) {
            return null;
        }
        return clone ? this.shuttleProtocol.clone() : this.shuttleProtocol;
    }

    @Override
    public CommandResponse movePath(List<NavigateNode> nodes, Integer taskNo) {
        CommandResponse response = new CommandResponse(true);
        return response;
    }

    @Override
    public CommandResponse move(ShuttleCommand command) {
        CommandResponse response = new CommandResponse(false);
        try {
            //发出请求
            NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
            Map<String, Object> body = httpCommand.getRequest().getBody();
            Object pathObj = body.get("path");
            int taskId = Integer.parseInt(body.get("taskId").toString());
            List<JSONObject> path = JSON.parseArray(JSON.toJSONString(pathObj), JSONObject.class);
            ArrayList<NyShuttleHttpCommand> commandList = new ArrayList<>();
            while (!path.isEmpty()) {
                ArrayList<Map<String, Object>> list = new ArrayList<>();
                if (path.size() > 10) {
                    List<JSONObject> subList = path.subList(0, 10);
                    list.addAll(subList);

                    List<JSONObject> tmp = new ArrayList<>();
                    for (int i = 10; i < path.size(); i++) {
                        tmp.add(path.get(i));
                    }
                    path = tmp;
                }else  {
                    list.addAll(path);
                    path.clear();
                }

                NyShuttleHttpCommand httpCommandCopy = JSON.parseObject(JSON.toJSONString(httpCommand), NyShuttleHttpCommand.class);
                JSONObject bodyCopy = JSON.parseObject(JSON.toJSONString(body));

                NyShuttleHttpCommand.NyRequest request = httpCommandCopy.getRequest();
                bodyCopy.put("path", list);
                bodyCopy.put("taskId", taskId++);
                request.setBody(bodyCopy);
                httpCommandCopy.setRequest(request);

                commandList.add(httpCommandCopy);//add copy
            }

            for (NyShuttleHttpCommand requestCommand : commandList) {
                while (true) {
                    JSONObject result = requestCommand(requestCommand);
                    if (result == null) {
//                        return response;//请求失败
                        continue;//请求失败尝试重新请求
                    }
                    this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
                    response.setMessage(JSON.toJSONString(result));
                    response.setResult(true);
                    break;
                }
            }
            return response;
        } catch (Exception e) {
            e.printStackTrace();
            response.setMessage(e.getMessage());
            return response;
        }
    }

    @Override
    public CommandResponse lift(ShuttleCommand command) {
        CommandResponse response = new CommandResponse(false);
        try {
            //发出请求
            NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
            JSONObject result = requestCommand(httpCommand);
            if (result == null) {
                return response;//请求失败
            }
            this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
            response.setMessage(JSON.toJSONString(result));
            response.setResult(true);
            return response;
        } catch (Exception e) {
            e.printStackTrace();
            return response;
        }
    }

    @Override
    public CommandResponse charge(ShuttleCommand command) {
        CommandResponse response = new CommandResponse(false);
        try {
            //发出请求
            NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
            JSONObject result = requestCommand(httpCommand);
            if (result == null) {
                return response;//请求失败
            }
            this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
            response.setMessage(JSON.toJSONString(result));
            response.setResult(true);
            return response;
        } catch (Exception e) {
            e.printStackTrace();
            return response;
        }
    }

    @Override
    public CommandResponse reset(ShuttleCommand command) {
        setSyncTaskNo(0);
        setProtocolStatus(ShuttleProtocolStatusType.IDLE);
        enableMoveLoc(null, false);
        return new CommandResponse(true, JSON.toJSONString(command));
    }

    @Override
    public CommandResponse updateLocation(ShuttleCommand command) {
        CommandResponse response = new CommandResponse(false);
        try {
            //发出请求
            NyShuttleHttpCommand httpCommand = JSON.parseObject(command.getBody(), NyShuttleHttpCommand.class);
            JSONObject result = requestCommand(httpCommand);
            if (result == null) {
                return response;//请求失败
            }
            this.shuttleProtocol.setSendTime(System.currentTimeMillis());//指令下发时间
            response.setMessage(JSON.toJSONString(result));
            response.setResult(true);
            return response;
        } catch (Exception e) {
            e.printStackTrace();
            return response;
        }
    }

    @Override
    public boolean isIdle() {
        return this.isIdle(null);
    }

    @Override
    public boolean isIdle(ExecuteSupport support) {
        if (null != support) {
            Boolean judgement = support.judgement();
            if (judgement != null && !judgement) {
                return true;
            }
        }

        if (this.shuttleProtocol.getDeviceStatus() == null
                || this.shuttleProtocol.getPakMk() == null
                || this.shuttleProtocol.getErrorCode() == null
                || this.shuttleProtocol.getProtocolStatus() == null
                || this.shuttleProtocol.getMode() == null
                || this.shuttleProtocol.getExtend() == null
        ) {
            return false;
        }

        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();

        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
                && this.shuttleProtocol.getTaskNo() == 0
                && (this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.IDLE.id
                || this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id
                || this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.CHARGING_WAITING.id)
                && extend.getSuspendState() == 0;
        return res;
    }

    @Override
    public boolean isDeviceIdle() {
        return isDeviceIdle(null);
    }

    @Override
    public boolean isDeviceIdle(ExecuteSupport support) {
        if (null != support) {
            Boolean judgement = support.judgement();
            if (judgement != null && !judgement) {
                return true;
            }
        }

        if (this.shuttleProtocol.getDeviceStatus() == null
                || this.shuttleProtocol.getPakMk() == null
                || this.shuttleProtocol.getErrorCode() == null
                || this.shuttleProtocol.getMode() == null
                || this.shuttleProtocol.getExtend() == null
        ) {
            return false;
        }

        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();

        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
                && extend.getSuspendState() == 0
                ;
        return res;
    }

    @Override
    public boolean isRequireCharge() {
        if (this.shuttleProtocol.getDeviceStatus() == null
                || this.shuttleProtocol.getPakMk() == null
                || this.shuttleProtocol.getErrorCode() == null
                || this.shuttleProtocol.getProtocolStatus() == null
                || this.shuttleProtocol.getMode() == null
                || this.shuttleProtocol.getExtend() == null
        ) {
            return false;
        }

        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();

        boolean res = this.shuttleProtocol.getDeviceStatus() == 1
                && this.shuttleProtocol.getMode() == 1
                && this.shuttleProtocol.getPakMk()
                && this.shuttleProtocol.getErrorCode().equals("0")
                && this.shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.IDLE.id
                && extend.getSuspendState() == 0
                ;
        if (!res) {
            return res;
        } else {
            // ç”µé‡å°äºŽé˜ˆå€¼éœ€è¦è¿›è¡Œå……电
            try {
                BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
                if (shuttleService == null) {
                    return false;
                }
                BasShuttle basShuttle = shuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", slave.getId()));
                if (basShuttle == null) {
                    return false;
                }
                Integer chargeLine = basShuttle.getChargeLine();
                if (chargeLine == null) {
                    return false;
                }
                return Integer.valueOf(this.shuttleProtocol.getBatteryPower()) < chargeLine;
            } catch (Exception e) {
                return false;
            }
        }
    }

    @Override
    public boolean isCharging() {
        if (this.shuttleProtocol.getDeviceStatus() == null || this.shuttleProtocol.getHasCharge() == null) {
            return false;
        }

        if (this.shuttleProtocol.getDeviceStatus() == 0 && this.shuttleProtocol.getHasCharge()) {
            //运行中 && å……电中
            return true;
        }
        return false;
    }

    @Override
    public boolean isChargingCompleted() {
        Integer maxPower = 100;
        ConfigService configService = SpringUtils.getBean(ConfigService.class);
        if (configService != null) {
            Config chargeMaxValue = configService.selectOne(new EntityWrapper<Config>()
                    .eq("code", "chargeMaxValue")
                    .eq("status", 1));
            if (chargeMaxValue != null) {
                maxPower = Integer.parseInt(chargeMaxValue.getValue());
            }
        }

        //***************判断是否满充校准***************
        Config shuttleMaxPowerVerifyConfig = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "shuttleMaxPowerVerify")
                .eq("status", 1));
        if (shuttleMaxPowerVerifyConfig != null) {
            if (shuttleMaxPowerVerifyConfig.getValue().equals("true")) {
                if (this.shuttleProtocol.getBatteryVoltage() < 5630) {
                    return false;//电压不够继续充电
                }
            }
        }
        //***************判断是否满充校准***************

        if (this.shuttleProtocol.getHasCharge() == null) {
            return false;
        }

        if (this.shuttleProtocol.getBatteryPower() == null) {
            return false;
        }

        if (!this.shuttleProtocol.getHasCharge()) {
            return false;
        }

        if (Integer.valueOf(this.shuttleProtocol.getBatteryPower()) >= maxPower) {
            return true;
        }
        return false;
    }

    @Override
    public boolean isFault() {
        if (this.shuttleProtocol.getErrorCode() == null
                || this.shuttleProtocol.getMode() == null
                || this.shuttleProtocol.getExtend() == null
        ) {
            return false;
        }

        if (this.shuttleProtocol.getMode() == 0) {
            return true;
        }

        if (!this.shuttleProtocol.getErrorCode().equals("0")) {
            return true;
        }

        InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();

        if (extend.getSuspendState() == 1) {
            return true;
        }

        return false;
    }

    @Override
    public List<NavigateNode> getMoveAdvancePath() {
        ObjectMapper objectMapper = SpringUtils.getBean(ObjectMapper.class);
        NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
        ArrayList<NavigateNode> path = new ArrayList<>();
        if (shuttleProtocol.getTaskNo() != 0) {
            //存在任务，获取指令
            Object object = redisUtil.get(RedisKeyType.SHUTTLE_WORK_FLAG.key + shuttleProtocol.getTaskNo());
            if (object != null) {
                ShuttleRedisCommand redisCommand = null;
                try {
                    redisCommand = objectMapper.readValue(String.valueOf(object), ShuttleRedisCommand.class);
                } catch (IOException e) {
                    return path;
                }
                List<NavigateNode> nodes = redisCommand.getAssignCommand().getNodes();//穿梭车预计路径
                if (nodes == null) {
                    return path;
                }
                if (!nodes.isEmpty()) {
                    path.addAll(nodes);
                }
                NavigateNode navigateNode = path.get(0);
                int lev = navigateNode.getZ();

                //将路径锁与小车路径进行匹配
                ArrayList<NavigateNode> tmp = new ArrayList<>();
                //检测路径是否被锁定
                int[][] map = navigateMapData.getDataFromRedis(lev, NavigationMapType.DFX.id, null, null);
                for (NavigateNode node : path) {
                    if(map[node.getX()][node.getY()] == -999) {
                        tmp.add(node);
                    }
                }

                path = tmp;
            }
        }
        return path;
    }

    @Override
    public int generateDeviceTaskNo(int taskNo, ShuttleTaskNoType type) {
        return taskNo;
    }

    @Override
    public synchronized boolean setProtocolStatus(ShuttleProtocolStatusType status) {
        this.shuttleProtocol.setProtocolStatus(status);
        return true;
    }

    @Override
    public synchronized boolean setTaskNo(Integer taskNo) {
        this.shuttleProtocol.setTaskNo(taskNo);
        return true;
    }

    @Override
    public synchronized boolean setSyncTaskNo(Integer taskNo) {
        this.shuttleProtocol.setSyncTaskNo(taskNo);
        return true;
    }

    @Override
    public synchronized boolean setPakMk(boolean pakMk) {
        this.shuttleProtocol.setPakMk(pakMk);
        return true;
    }

    @Override
    public boolean enableMoveLoc(ShuttleMoveLocParam param, boolean enable) {
        if (enable) {
            shuttleProtocol.setMoveLoc(true);//开启跑库
            shuttleProtocol.setMoveType(param.getMoveType());
            shuttleProtocol.setXStart(param.getStartX());
            shuttleProtocol.setXTarget(param.getTargetX());
            shuttleProtocol.setXCurrent(param.getStartX());
            shuttleProtocol.setYStart(param.getStartY());
            shuttleProtocol.setYTarget(param.getTargetY());
            shuttleProtocol.setYCurrent(param.getStartY());
        }else {
            shuttleProtocol.setMoveLoc(false);
            shuttleProtocol.setMoveType(0);
            shuttleProtocol.setXStart(0);
            shuttleProtocol.setXTarget(0);
            shuttleProtocol.setXCurrent(0);
            shuttleProtocol.setYStart(0);
            shuttleProtocol.setYTarget(0);
            shuttleProtocol.setYCurrent(0);
        }
        return true;
    }

    @Override
    public boolean requestWaiting() {
        if (this.shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.IDLE)) {
            this.shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WAITING);
            return true;
        }
        return false;
    }

    @Override
    public boolean enableDemo(boolean enable) {
        shuttleProtocol.setDemo(enable);
        return true;
    }

    @Override
    public boolean offerSystemMsg(String format, Object... arguments) {
        String msg = News.replace(format, arguments);
        shuttleProtocol.setSystemMsg(msg);
        return true;
    }

    @Override
    public ShuttleCommand getMoveCommand(Integer taskNo, String startCodeNum, String distCodeNum, Integer allDistance, Integer runDirection, Integer runSpeed, List<NavigateNode> nodes) {
        NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
        NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        ArrayList<HashMap<String, Object>> path = new ArrayList<>();

        Integer taskId = getTaskId();
        HashMap<String, Object> body = new HashMap<>();
        body.put("requestType", "move");//移动命令
        body.put("taskId", taskId);//TaskID需要随机
//        body.put("start", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(startCodeNum, device.getHostId())));//起点
//        body.put("target", navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(distCodeNum, device.getHostId())));//终点
        body.put("path", path);
        request.setBody(body);

        NavigateNode startNode = nodes.get(0);
        for (NavigateNode node : nodes) {
            HashMap<String, Object> data = new HashMap<>();
            String codeNum = NavigatePositionConvert.xyToPosition(node.getX(), node.getY(), node.getZ());
            Map<String, Object> nyNode = navigateNodeToNyPointNode(NavigatePositionConvert.codeToNode(codeNum));
            int xp = Integer.parseInt(String.valueOf(nyNode.get("y")));
            int yp = Integer.parseInt(String.valueOf(nyNode.get("x")));
            int z = Integer.parseInt(String.valueOf(nyNode.get("z")));

            List<List<MapNode>> mapData = navigateMapData.getJsonData(startNode.getZ(), NavigationMapType.NONE.id, null, null);
            List<MapNode> mapNodes = mapData.get(node.getX());
            MapNode mapNode = mapNodes.get(node.getY());

            data.put("xp", xp);
            data.put("yp", yp);
            data.put("z", z);
            data.put("x", mapNode.getXBase());
            data.put("y", mapNode.getYBase());
            path.add(data);
        }

        httpStandard.setRequest(request);

        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("qr_code_value", distCodeNum));
        if (locMast == null) {
            throw new CoolException("库位信息不存在");
        }

        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(slave.getId());
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(ShuttleCommandModeType.MOVE.id);
        command.setTargetLocNo(locMast.getLocNo());
        command.setTaskNo(taskId);
        return command;
    }

    @Override
    public ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift) {
        NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        Integer taskId = getTaskId();//TaskID需要随机
        HashMap<String, Object> body = new HashMap<>();
        body.put("requestType", lift ? "liftUp" : "liftDown");//顶升或下降命令
        body.put("taskId", taskId);
        request.setBody(body);

        httpStandard.setRequest(request);

        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(slave.getId());
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(lift ? ShuttleCommandModeType.PALLET_LIFT.id : ShuttleCommandModeType.PALLET_DOWN.id);
        command.setTaskNo(taskId);
        return command;
    }

    @Override
    public ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge) {
        NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        Integer taskId = getTaskId();//TaskID需要随机
        HashMap<String, Object> body = new HashMap<>();
        body.put("requestType", charge ? "charge" : "stopCharge");//充电或停止充电
        body.put("taskId", taskId);
        request.setBody(body);

        httpStandard.setRequest(request);

        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(slave.getId());
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(charge ? ShuttleCommandModeType.CHARGE_OPEN.id : ShuttleCommandModeType.CHARGE_CLOSE.id);
        command.setTaskNo(taskId);
        return command;
    }

    @Override
    public ShuttleCommand getUpdateLocationCommand(Integer taskNo, String locNo) {
        NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        HashMap<String, Object> body = new HashMap<>();
        body.put("requestType", "updateFloor");//更新层Z
        body.put("z", Utils.getLev(locNo));//坐标Z
        request.setBody(body);

        httpStandard.setRequest(request);

        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(slave.getId());
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(ShuttleCommandModeType.UPDATE_LOCATION.id);
        command.setTaskNo(taskNo);
        return command;
    }

    //获取小车复位响应命令
    public ShuttleCommand getInitCommand(Integer taskNo, Integer code) {
        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
        NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
        NyShuttleHttpCommand httpStandard = getHttpStandard(slave.getId(), taskNo);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        //code -> {Integer@13781} 1101101
        int lev = code % 100;
        int bay = code / 100 % 1000;
        int row = code / 100000;

        HashMap<String, Object> map = new HashMap<>();
        map.put("x", row);
        map.put("y", bay);
        map.put("z", lev);

        String mapStr = JSON.toJSONString(map);
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("qr_code_value", mapStr));
        if (locMast == null) {
            throw new CoolException("地址码不存在");
        }

        List<List<MapNode>> mapData = navigateMapData.getJsonData(lev, NavigationMapType.NONE.id, null, null);
        List<MapNode> mapNodes = mapData.get(locMast.getRow1());
        MapNode mapNode = mapNodes.get(locMast.getBay1());

        HashMap<String, Object> location = new HashMap<>();
        location.put("xp", row);
        location.put("yp", bay);
        location.put("z", lev);
        location.put("x", mapNode.getXBase());
        location.put("y", mapNode.getYBase());

        HashMap<String, Object> body = new HashMap<>();
        body.put("responseType", "init");//复位
        body.put("location", location);//初始化坐标
        body.put("devicePoints", new ArrayList<>());//提升机点位
        body.put("specialPoints", new ArrayList<>());//特殊条码坐标
        request.setBody(body);

        httpStandard.setRequest(request);

        ShuttleCommand command = new ShuttleCommand();
        command.setShuttleNo(slave.getId());
        command.setBody(JSON.toJSONString(httpStandard));
        command.setMode(ShuttleCommandModeType.RESET.id);
        command.setTaskNo(taskNo);
        return command;
    }
//    public JSONObject getRequestBody(String type, String taskId) {
//        try {
//            // èŽ·å–服务器响应
//            JSONObject result = null;
//            if (type.equals("readState")) {
//                type = "state";
//            }
//
//            for (int i = 0; i < socketResults.size(); i++) {
//                JSONObject socketResult = socketResults.get(i);
//                if (!socketResult.get("msgType").equals("responseMsg")) {//不是响应内容
//                    continue;
//                }
//
//                JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
//                JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
//                String responseType = resultBody.get("responseType").toString();
//                if (DEBUG) {
//                    result = socketResult;
//                    break;
//                }
//
//                if (!responseType.equals(type)) {
//                    continue;//响应类型与请求类型不一致，不在调试模式下
//                }
//
//                if (taskId != null) {
//                    String responseTaskId = resultBody.get("taskId").toString();
//                    if (!responseTaskId.equals(taskId)) {
//                        continue;//响应ID与请求ID不一致，不在调试模式下
//                    }
//                }
//
//                result = socketResult;
//                break;
//            }
//
//            if (result == null) {
//                return null;//无响应结果
//            }
//
//            return filterBodyData(result);//返回Body结果集
//        } catch (Exception e) {
//            return null;
//        }
//    }

    @Override
    public boolean connect() {
        try {
            InetAddress address = InetAddress.getByName(slave.getIp());
            if (address.isReachable(10000)) {
                Socket socket = new Socket(slave.getIp(), slave.getPort());
                socket.setSoTimeout(10000);
                socket.setKeepAlive(true);
                this.socket = socket;
                log.info(MessageFormat.format("【{0}】四向穿梭车Socket链接成功 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            }
        } catch (Exception e) {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket链接失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            return false;
        }

        return true;
    }

@@ -1034,183 +202,91 @@

    }

    //获取HTTP请求标准结构体
    private NyShuttleHttpCommand getHttpStandard(Integer shuttleNo, Integer taskNo) {
        NyShuttleHttpCommand httpStandard = new NyShuttleHttpCommand();
        httpStandard.setMsgType("requestMsg");//请求消息
        httpStandard.setRobotId(shuttleNo);//车辆编号
        httpStandard.setTaskNo(taskNo);//工作号

        //设置请求消息
        NyShuttleHttpCommand.NyRequest request = new NyShuttleHttpCommand.NyRequest();
        NyShuttleHttpCommand.NyRequest.NyHeader header = new NyShuttleHttpCommand.NyRequest.NyHeader();
        header.setVersion("1.0");//版本号
        header.setRequestId(getRequestId());//消息编号

        //设置请求头
        request.setHeader(header);
        httpStandard.setRequest(request);
        return httpStandard;
    }

    //获取请求编号
    private Integer getRequestId() {
        Random random = new Random();
        return random.nextInt(9999999);
    }

    //获取TaskId
    private static Integer getTaskId() {
        Random random = new Random();
        return random.nextInt(999999);
    }

    //获取读FAS状态信息命令
    private NyShuttleHttpCommand getReadStatusCommand(Integer shuttleNo) {
        NyShuttleHttpCommand httpStandard = getHttpStandard(shuttleNo, 9999);
        NyShuttleHttpCommand.NyRequest request = httpStandard.getRequest();

        HashMap<String, Object> body = new HashMap<>();
        body.put("requestType", "readState");//读FAS状态信息
        request.setBody(body);

        httpStandard.setRequest(request);
        return httpStandard;
    }

    //发出请求
    private JSONObject requestCommand(NyShuttleHttpCommand httpCommand) throws IOException {
        try {
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            if (deviceMsgUtils == null) {
                return null;
            }

            //压缩数据包
            JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
            data.remove("nodes");

            String key = deviceMsgUtils.sendCommand(SlaveType.Shuttle, slave.getId(), data);

            String requestType = null;
            String taskId = null;
            try {
                requestType = httpCommand.getRequest().getBody().get("requestType").toString();
                taskId = httpCommand.getRequest().getBody().get("taskId").toString();
            } catch (Exception e) {
//    //发出请求
//    private JSONObject requestCommand(NyShuttleHttpCommand httpCommand) throws IOException {
//        try {
//            if (this.socket == null) {
//                return null;
//            }
//
//            //压缩数据包
//            JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
//            data.remove("nodes");
//
//            // èŽ·å–输出流
//            OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
//            writer.write(JSON.toJSONString(data) + "\r\n");
//            writer.flush();
////            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
//
//            String requestType = null;
//            String taskId = null;
//            try {
//                requestType = httpCommand.getRequest().getBody().get("requestType").toString();
//                taskId = httpCommand.getRequest().getBody().get("taskId").toString();
//            } catch (Exception e) {
////            return null;
//                //taskId可能取空，不报错，正常情况
//            }
//
//            // èŽ·å–服务器响应
//            // å°è¯•10次
//            JSONObject result = null;
//            for (int i = 0; i < 10; i++) {
//                result = getRequestBody(requestType, taskId);
//                if (result == null) {
//                    try {
//                        Thread.sleep(100);
//                    } catch (Exception e) {
//                        e.printStackTrace();
//                    }
//                }else {
//                    break;
//                }
//            }
//            return result;//返回Body结果集
//        }catch (Exception e) {
//            e.printStackTrace();
//        }
//        return null;
//    }
//
//    private void requestCommandAsync(NyShuttleHttpCommand httpCommand) throws IOException {
//        if (this.socket == null) {
//            return;
//        }
//
//       try {
//           //压缩数据包
//           JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
//           data.remove("nodes");
//
//           // èŽ·å–输出流
//           OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
//           writer.write(JSON.toJSONString(data) + "\r\n");
//           writer.flush();
////            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
//       }catch (Exception e) {
////           e.printStackTrace();
////           System.out.println("socket write error");
//           this.socket.close();
//           this.socket = null;
//       }
//    }
//
//    private JSONObject filterBodyData(JSONObject data) {
//        Object response = data.get("response");
//        if (response == null) {
//            return null;
                //taskId可能取空，不报错，正常情况
            }
//        }
//
//        JSONObject result = JSON.parseObject(response.toString());
//        Object body = result.get("body");
//        if (body == null) {
//            return null;
//        }
//        JSONObject jsonBody = JSON.parseObject(body.toString());
//        return jsonBody;
//    }

            // èŽ·å–服务器响应
            // å°è¯•30次
            JSONObject result = null;
            for (int i = 0; i < 30; i++) {
                result = getRequestBody(requestType, taskId);
                if (result == null) {
                    try {
                        Thread.sleep(100);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }else {
                    break;
                }
            }
            return result;//返回Body结果集
        }catch (Exception e) {
            e.printStackTrace();
        }
        return null;
    }

    private JSONObject filterBodyData(JSONObject data) {
        Object response = data.get("response");
        if (response == null) {
            return null;
        }

        JSONObject result = JSON.parseObject(response.toString());
        Object body = result.get("body");
        if (body == null) {
            return null;
        }
        JSONObject jsonBody = JSON.parseObject(body.toString());
        return jsonBody;
    }

    //地图节点转换牛眼节点
    private static Map<String, Object> navigateNodeToNyPointNode(NavigateNode node) {
        int[] NyPosition = WCSXyzToNyXyz(node.getX(), node.getY(), node.getZ());//WCS系统坐标转牛眼坐标
        HashMap<String, Object> point = new HashMap<>();
        point.put("x", NyPosition[0]);
        point.put("y", NyPosition[1]);
        point.put("z", NyPosition[2]);
        return point;
    }

    //WCS系统坐标转牛眼坐标
    private static int[] WCSXyzToNyXyz(int x, int y, int z) {
//        //WCS系统Yè½´ => ç‰›çœ¼X轴转换公式
//        int x1 = Math.abs(y - 61) + 11;
//        //WCS系统Xè½´ => ç‰›çœ¼Y轴转换公式
//        int y1 = x + 10;

//        int x1 = x + 10;
//        int y1 = y + 10;
        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("row1", x)
                .eq("bay1", y)
                .eq("lev1", z)
                .eq("status", 1));
        if (locMast == null) {
            return null;
        }

        String qrCodeValue = locMast.getQrCodeValue();
        JSONObject data = JSON.parseObject(qrCodeValue);
        return new int[]{data.getInteger("y"), data.getInteger("x"), z};
    }

    @Data
    private class InnerSuhttleExtend {

        /**
         * ç®¡åˆ¶çŠ¶æ€ä¸åœ¨ç®¡åˆ¶ä¸‹/被管制中
         * 0/1
         */
        private Integer suspendState;

        /**
         * æœ€é«˜ç”µèŠ¯ç”µåŽ‹(mV)
         */
        private Integer maxCellVoltage;

        /**
         * æœ€ä½Žç”µèŠ¯ç”µåŽ‹(mV)，低于2900mv需要立即充电
         */
        private Integer minCellVoltage;

        /**
         * ç”µæ± ç”µåŽ‹ï¼ˆmV）
         */
        private Integer voltage;

        /**
         * å……放电循环次数
         */
        private Integer chargeCycleTimes;

        /**
         * å‰©ä½™ç”µé‡/10(A)
         */
        private Integer surplusQuantity;

        /**
         * æ€»ç”µé‡/10(A)
         */
        private Integer countQuantity;

    }
}

 src/main/java/com/zy/core/thread/impl/NyShuttleThread2.java

File was deleted

 src/main/java/com/zy/core/thread/impl/ZyForkLiftThread.java

File was deleted

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 9090
  port: 9099
  servlet:
    context-path: /@pom.build.finalName@


 src/main/resources/docs/̨ÉýËÄÏò¿âWCSÓë»õ²æÌáÉý»úPLCͨѶ½Ó¿ÚЭÒé1.0.docx

Binary files differ

 src/main/resources/docs/̨ÉýËÄÏò¿âWCSÓë»õ²æÌáÉý»úPLCͨѶ½Ó¿ÚЭÒé1.1.docx

Binary files differ

 src/main/resources/docs/ËÄÏò³µ»õ²æʽÌáÉý»úWCS½Ó¿ÚV1.0.docx

Binary files differ

 src/main/resources/docs/ËÄÏò³µ»õ²æʽÌáÉý»úWCS½Ó¿ÚV1.1.docx

Binary files differ

 src/main/resources/docs/ËÄÏò³µ»õ²æʽÌáÉý»úWCS½Ó¿ÚV1.2.docx

Binary files differ

 src/main/resources/docs/ËÄÏò³µ»õ²æʽÌáÉý»úWCS½Ó¿ÚV1.3.docx

Binary files differ

 src/main/resources/docs/ËÄÏò³µ»õ²æʽÌáÉý»úWCS½Ó¿ÚV1.4.docx

Binary files differ

 src/main/resources/mapper/ApiLogMapper.xml

File was deleted

 src/main/resources/mapper/BasDevpMapper.xml

File was deleted

 src/main/resources/mapper/BasLiftErrLogMapper.xml

File was deleted

 src/main/resources/mapper/BasLiftErrMapper.xml

File was deleted

 src/main/resources/mapper/BasLiftMapper.xml

File was deleted

 src/main/resources/mapper/BasLiftOptMapper.xml

File was deleted

 src/main/resources/mapper/BasLocStsMapper.xml

File was deleted

 src/main/resources/mapper/BasMapMapper.xml

File was deleted

 src/main/resources/mapper/BasPlcerrorMapper.xml

File was deleted

 src/main/resources/mapper/BasShuttleChargeMapper.xml

File was deleted

 src/main/resources/mapper/BasShuttleErrLogMapper.xml

File was deleted

 src/main/resources/mapper/BasShuttleErrMapper.xml

File was deleted

 src/main/resources/mapper/BasShuttleMapper.xml

File was deleted

 src/main/resources/mapper/BasShuttleOptMapper.xml

File was deleted

 src/main/resources/mapper/BasWrkIotypeMapper.xml

File was deleted

 src/main/resources/mapper/BasWrkStatusMapper.xml

File was deleted

 src/main/resources/mapper/ConfigMapper.xml

File was deleted

 src/main/resources/mapper/DeviceDataLogMapper.xml

File was deleted

 src/main/resources/mapper/HostMapper.xml

File was deleted

 src/main/resources/mapper/HttpRequestLogMapper.xml

File was deleted

 src/main/resources/mapper/LocMastMapper.xml

File was deleted

 src/main/resources/mapper/OperateLogMapper.xml

File was deleted

 src/main/resources/mapper/PermissionMapper.xml

File was deleted

 src/main/resources/mapper/ResourceMapper.xml

File was deleted

 src/main/resources/mapper/RoleMapper.xml

File was deleted

 src/main/resources/mapper/RolePermissionMapper.xml

File was deleted

 src/main/resources/mapper/RoleResourceMapper.xml

File was deleted

 src/main/resources/mapper/RowLastnoMapper.xml

File was deleted

 src/main/resources/mapper/StaDescMapper.xml

File was deleted

 src/main/resources/mapper/UserLoginMapper.xml

File was deleted

 src/main/resources/mapper/UserMapper.xml

File was deleted

 src/main/resources/mapper/WrkLastnoMapper.xml

File was deleted

 src/main/resources/mapper/WrkMastLogMapper.xml

File was deleted

 src/main/resources/mapper/WrkMastMapper.xml

File was deleted

 src/main/resources/sql/20250424151727.nb3

Binary files differ

 src/main/resources/sql/20250424153111.nb3

Binary files differ

 src/main/resources/sql/20250509105930.nb3

Binary files differ

 src/main/resources/sql/20250513125153.nb3

Binary files differ

 src/main/resources/sql/³ö¿âÈÎÎñÔ¤µ÷¶ÈÌáÉý»úsql

File was deleted

 src/main/resources/sql/С³µ±ÜÕÏÅäÖÃsql

File was deleted

 src/main/resources/sql/¿âλµØͼsql

File was deleted

 src/main/resources/sql/»õ²æÌáÉý»úÒì³£Âësql

File was deleted