liusuyi
2025-10-30 9f911c1461ba33c1a561046eb1ac8e1c56fc9b9d
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -46,6 +46,8 @@
import com.ard.work.domain.dto.wayline.*;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
import com.ard.work.domain.message.BaseMessage;
import com.ard.work.domain.message.ServerReplyMessage;
import com.ard.work.domain.message.UavControlType;
import com.ard.work.domain.receiver.*;
import com.ard.work.service.IArdDroneInfoService;
@@ -92,7 +94,7 @@
     */
    @Override
    public List<BoxInfoReceiver> getBoxList() {
        List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo());
        List<ArdServerInfo> ardServerInfos = ardServerService.selectArdServerInfoList(new ArdServerInfo() {{ setUseDataScope(false); }});
        return getBoxList(ardServerInfos);
    }
@@ -902,22 +904,24 @@
    //公共日志打印
    private void logPrint(String message, Object obj) {
        String text = String.format("收到%s回复%s", message, obj);
        WebSocketUtil.sendMessageAll(text);
        log.info(text);
        String text = String.format("收到%s回复 %s", message, obj);
        ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
        WebSocketUtil.sendMessage("reply", serverReplyMessage);
        log.debug(text);
    }
    //公共日志打印
    private void logPrint(String message, byte result, Integer errorCode) {
        String text = String.format(
                "收到%s回复:%s 错误码:%d【%s】",
                "收到%s回复 状态码:%d【%s】",
                message,
                ByteUtils.byteToHex(result),
                //ByteUtils.byteToHex(result),
                errorCode,
                ErrorCodeEnum.getDescByCode(errorCode)
        );
        WebSocketUtil.sendMessageAll(text);
        log.info(text);
        ServerReplyMessage serverReplyMessage = ServerReplyMessage.builder().message(text).build();
        WebSocketUtil.sendMessage("reply", serverReplyMessage);
        log.debug(text);
    }