IOT/MiddlePlatform
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#update

Browse Source
This commit is contained in:
rqian
2026-04-17 17:12:41 +08:00
parent 99d9406936
commit a4b8203687
638 changed files with 4235 additions and 45595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maibu-netty-server/src/main/java/com/maibu/common/CommandConstant.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.common;
package com.maibu.common;
public class CommandConstant {

2
maibu-netty-server/src/main/java/com/maibu/common/Constant.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.common;
package com.maibu.common;
import io.netty.util.AttributeKey;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/common/NettyCacheKey.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.common;
package com.maibu.common;
import lombok.Data;

22
maibu-netty-server/src/main/java/com/maibu/controller/DeviceExternalApiController.java
View File

@@ -1,18 +1,12 @@
package com.fastbee.controller;
package com.maibu.controller;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.common.utils.json.JsonUtils;
import com.fastbee.dto.DeviceTaskQueryDTO;
import com.fastbee.dto.NettyDevice;
import com.fastbee.dto.ObstacleData;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.service.DeviceTaskService;
import com.fastbee.utils.CommandUtils;
import com.maibu.common.CommandConstant;
import com.maibu.core.controller.BaseController;
import com.maibu.core.domain.AjaxResult;
import com.maibu.dto.NettyDevice;
import com.maibu.dto.ObstacleData;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.utils.CommandUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.CharsetUtil;

6
maibu-netty-server/src/main/java/com/maibu/controller/DeviceMemoryController.java
View File

@@ -1,7 +1,7 @@
package com.fastbee.controller;
package com.maibu.controller;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.memory.GlobalMemory;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.memory.GlobalMemory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

16
maibu-netty-server/src/main/java/com/maibu/controller/DeviceTaskController.java
View File

@@ -1,12 +1,12 @@
package com.fastbee.controller;
package com.maibu.controller;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.utils.SecurityUtils;
import com.fastbee.dto.DeviceTaskQueryDTO;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.service.DeviceTaskService;
import com.maibu.core.controller.BaseController;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.domain.DevicePlan;
import com.maibu.dto.DeviceTaskQueryDTO;
import com.maibu.service.DeviceTaskService;
import com.maibu.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

14
maibu-netty-server/src/main/java/com/maibu/controller/NettyDeviceController.java
View File

@@ -1,11 +1,11 @@
package com.fastbee.controller;
package com.maibu.controller;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.page.TableDataInfo;
import com.fastbee.iot.domain.DeviceRunningStatusHistory;
import com.fastbee.entity.ErrorIdentificationStandard;
import com.fastbee.service.NettyDeviceService;
import com.maibu.core.controller.BaseController;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.page.TableDataInfo;
import com.maibu.domain.DeviceRunningStatusHistory;
import com.maibu.entity.ErrorIdentificationStandard;
import com.maibu.service.NettyDeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

17
maibu-netty-server/src/main/java/com/maibu/controller/TransferDeviceController.java
View File

@@ -1,13 +1,12 @@
package com.fastbee.controller;
package com.maibu.controller;
import com.fastbee.common.annotation.Log;
import com.fastbee.common.core.controller.BaseController;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.enums.BusinessType;
import com.fastbee.common.utils.MessageUtils;
import com.fastbee.dto.DeviceBindDTO;
import com.fastbee.service.TransferDeviceService;
import com.maibu.annotation.Log;
import com.maibu.core.controller.BaseController;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.dto.DeviceBindDTO;
import com.maibu.enums.BusinessType;
import com.maibu.service.TransferDeviceService;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

4
maibu-netty-server/src/main/java/com/maibu/dto/Connector.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.enums.ConnectorStatus;
import com.maibu.enums.ConnectorStatus;
import io.netty.channel.Channel;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceBindDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceControlDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

4
maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDTO.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.enums.RespondCode;
import com.maibu.enums.RespondCode;
import lombok.Data;
import java.util.List;

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceErrorPushDetail.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

4
maibu-netty-server/src/main/java/com/maibu/dto/DeviceLoginResponseDTO.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.enums.RespondCode;
import com.maibu.enums.RespondCode;
import lombok.Data;
@Data

2
maibu-netty-server/src/main/java/com/maibu/dto/DevicePlanStatisticsDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/dto/DevicePlanTaskStatisticsDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

4
maibu-netty-server/src/main/java/com/maibu/dto/DeviceRequestDTO.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.enums.CommandRequestType;
import com.maibu.enums.CommandRequestType;
import lombok.Data;
@Data

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceRespondDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceRunningStatus.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

4
maibu-netty-server/src/main/java/com/maibu/dto/DeviceStatusChangeDTO.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.enums.RespondCode;
import com.maibu.enums.RespondCode;
import lombok.Data;
@Data

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceSwitchControlDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

4
maibu-netty-server/src/main/java/com/maibu/dto/DeviceTaskQueryDTO.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.iot.enums.DeviceTaskStaus;
import com.maibu.enums.DeviceTaskStaus;
import lombok.Data;
import java.time.LocalDateTime;

2
maibu-netty-server/src/main/java/com/maibu/dto/DeviceWorkStatisticsDTO.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

8
maibu-netty-server/src/main/java/com/maibu/dto/NettyDevice.java
View File

@@ -1,9 +1,9 @@
package com.fastbee.dto;
package com.maibu.dto;
import com.fastbee.entity.path.LatAndLngEntity;
import com.fastbee.enums.ConnectorType;
import com.fastbee.iot.domain.DeviceRunStatistics;
import com.maibu.domain.DeviceRunStatistics;
import com.maibu.entity.path.LatAndLngEntity;
import com.maibu.enums.ConnectorType;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
maibu-netty-server/src/main/java/com/maibu/dto/ObstacleData.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.dto;
package com.maibu.dto;
import lombok.Data;

4
maibu-netty-server/src/main/java/com/maibu/entity/ErrorIdentificationStandard.java
View File

@@ -1,9 +1,9 @@
package com.fastbee.entity;
package com.maibu.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fastbee.enums.CompareEnum;
import com.maibu.enums.CompareEnum;
import lombok.Data;
import org.springframework.data.annotation.Id;

2
maibu-netty-server/src/main/java/com/maibu/entity/path/LatAndLngEntity.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.entity.path;
package com.maibu.entity.path;
import lombok.Data;

5
maibu-netty-server/src/main/java/com/maibu/entity/path/MowingPathGenerator.java
View File

@@ -1,7 +1,8 @@
package com.fastbee.entity.path;
package com.maibu.entity.path;
import com.fastbee.common.utils.json.JsonUtils;
import com.maibu.utils.json.JsonUtils;
import java.util.ArrayList;
import java.util.Collections;

4
maibu-netty-server/src/main/java/com/maibu/entity/path/RPPathData.java
View File

@@ -1,7 +1,7 @@
package com.fastbee.entity.path;
import com.fastbee.entity.path.MowingPathGenerator.*;
package com.maibu.entity.path;
import java.util.List;
import com.maibu.entity.path.MowingPathGenerator.*;
public class RPPathData {
public ScanLine scanLine;

2
maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanRecEntity.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.entity.path;
package com.maibu.entity.path;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/entity/path/RoutePlanSendEntity.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.entity.path;
package com.maibu.entity.path;
import lombok.Data;

2
maibu-netty-server/src/main/java/com/maibu/enums/CommandRequestType.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
public enum CommandRequestType {
switch_control

2
maibu-netty-server/src/main/java/com/maibu/enums/CompareEnum.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
maibu-netty-server/src/main/java/com/maibu/enums/ConnectionCloseReason.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
public enum ConnectionCloseReason {
NROMAL,

2
maibu-netty-server/src/main/java/com/maibu/enums/ConnectorStatus.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
public enum ConnectorStatus {
ACTIVE, // 完全可用

2
maibu-netty-server/src/main/java/com/maibu/enums/ConnectorType.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
public enum ConnectorType {
MASTER, // 上位机（主动绑定别人）

2
maibu-netty-server/src/main/java/com/maibu/enums/DeviceStatus.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
maibu-netty-server/src/main/java/com/maibu/enums/RespondCode.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.enums;
package com.maibu.enums;
public enum RespondCode {
/**

27
maibu-netty-server/src/main/java/com/maibu/init/InitThread.java
View File

@@ -1,18 +1,14 @@
package com.fastbee.init;
package com.maibu.init;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fastbee.common.constant.FastBeeConstant;
import com.fastbee.common.core.domain.entity.UserClient;
import com.fastbee.framework.mybatis.LambdaQueryWrapperX;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.iot.domain.DevicePlanTask;
import com.fastbee.iot.enums.DeviceTaskStaus;
import com.fastbee.iot.mapper.DevicePlanMapper;
import com.fastbee.iot.mapper.DevicePlanTaskMapper;
import com.fastbee.memory.GlobalMemory;
import com.fastbee.service.DevicePlanTaskMonitorService;
import com.fastbee.service.DeviceThreadService;
import com.fastbee.system.mapper.SysUserClientMapper;
import com.maibu.constant.FastBeeConstant;
import com.maibu.domain.DevicePlan;
import com.maibu.enums.DeviceTaskStaus;
import com.maibu.mapper.DevicePlanMapper;
import com.maibu.mapper.SysUserClientMapper;
import com.maibu.memory.GlobalMemory;
import com.maibu.mybatis.LambdaQueryWrapperX;
import com.maibu.service.DevicePlanTaskMonitorService;
import com.maibu.service.DeviceThreadService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +20,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.Executor;
@@ -93,7 +88,7 @@ public class InitThread implements ApplicationRunner {
// sysUserClientMapper.clearDeviceName();
// 未执行完的重复计划
LambdaQueryWrapperX<DevicePlan> query = new LambdaQueryWrapperX<>();
List<String> list = Arrays.asList(DeviceTaskStaus.NEW.getCode(),DeviceTaskStaus.EXECUTING.getCode(),DeviceTaskStaus.PAUSE.getCode());
List<String> list = Arrays.asList(DeviceTaskStaus.NEW.getCode(),DeviceTaskStaus.EXECUTING.getCode(), DeviceTaskStaus.PAUSE.getCode());
query.in(DevicePlan::getTaskStaus, list);
List<DevicePlan> devicePlanList = devicePlanMapper.selectList(query);
if(!CollectionUtils.isEmpty(devicePlanList)){

11
maibu-netty-server/src/main/java/com/maibu/manager/DeviceSessionManager.java
View File

@@ -1,12 +1,11 @@
package com.fastbee.manager;
package com.maibu.manager;
import cn.hutool.core.util.ObjectUtil;
import com.fastbee.dto.Connector;
import com.fastbee.dto.NettyDevice;
import com.fastbee.enums.ConnectorStatus;
import com.fastbee.enums.ConnectorType;
import com.fastbee.netty.handler.CommandForwardHandler;
import com.maibu.dto.Connector;
import com.maibu.dto.NettyDevice;
import com.maibu.enums.ConnectorStatus;
import com.maibu.enums.ConnectorType;
import io.netty.channel.Channel;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;

6
maibu-netty-server/src/main/java/com/maibu/mapper/ErrorIdentificationStandardMapper.java
View File

@@ -1,7 +1,7 @@
package com.fastbee.mapper;
package com.maibu.mapper;
import com.fastbee.entity.ErrorIdentificationStandard;
import com.fastbee.framework.mybatis.mapper.BaseMapperX;
import com.maibu.entity.ErrorIdentificationStandard;
import com.maibu.mybatis.mapper.BaseMapperX;
import org.springframework.stereotype.Repository;
/**

9
maibu-netty-server/src/main/java/com/maibu/memory/GlobalMemory.java
View File

@@ -1,12 +1,11 @@
package com.fastbee.memory;
package com.maibu.memory;
import com.fastbee.entity.ErrorIdentificationStandard;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.iot.domain.DevicePlanTask;
import com.maibu.domain.DevicePlan;
import com.maibu.domain.DevicePlanTask;
import com.maibu.entity.ErrorIdentificationStandard;
import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.java_websocket.WebSocket;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

4
maibu-netty-server/src/main/java/com/maibu/netty/NettyServer.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.netty;
package com.maibu.netty;
import com.fastbee.netty.handler.*;
import com.maibu.netty.handler.*;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*;
import io.netty.channel.nio.NioEventLoopGroup;

15
maibu-netty-server/src/main/java/com/maibu/netty/handler/CommandForwardHandler.java
View File

@@ -1,11 +1,10 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.Constant;
import com.fastbee.dto.Connector;
import com.fastbee.dto.NettyDevice;
import com.fastbee.enums.ConnectorType;
import com.fastbee.manager.DeviceSessionManager;
import com.maibu.common.CommandConstant;
import com.maibu.dto.Connector;
import com.maibu.dto.NettyDevice;
import com.maibu.enums.ConnectorType;
import com.maibu.manager.DeviceSessionManager;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
@@ -18,8 +17,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Set;

18
maibu-netty-server/src/main/java/com/maibu/netty/handler/DataToDataBaseHandler.java
View File

@@ -1,13 +1,13 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.NettyCacheKey;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.dto.NettyDevice;
import com.fastbee.iot.domain.DeviceRunStatistics;
import com.fastbee.iot.domain.DeviceRunningStatusHistory;
import com.fastbee.iot.domain.DeviceStatusRecordDTO;
import com.fastbee.manager.DeviceSessionManager;
import com.maibu.common.CommandConstant;
import com.maibu.common.NettyCacheKey;
import com.maibu.core.redis.RedisCache;
import com.maibu.domain.DeviceRunStatistics;
import com.maibu.domain.DeviceRunningStatusHistory;
import com.maibu.domain.DeviceStatusRecordDTO;
import com.maibu.dto.NettyDevice;
import com.maibu.manager.DeviceSessionManager;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;

30
maibu-netty-server/src/main/java/com/maibu/netty/handler/DeviceConnectHandler.java
View File

@@ -1,20 +1,18 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.common.core.domain.entity.UserClient;
import com.fastbee.common.utils.json.JsonUtils;
import com.fastbee.dto.*;
import com.fastbee.entity.path.LatAndLngEntity;
import com.fastbee.enums.*;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.mapper.DeviceRunStatisticsMapper;
import com.fastbee.iot.service.IDeviceService;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.memory.GlobalMemory;
import com.fastbee.system.service.ISysUserClientService;
import com.fastbee.system.service.ISysUserService;
import com.fastbee.utils.CommandUtils;
import com.maibu.common.CommandConstant;
import com.maibu.core.domain.entity.SysUser;
import com.maibu.core.domain.entity.UserClient;
import com.maibu.domain.Device;
import com.maibu.dto.*;
import com.maibu.enums.*;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.mapper.DeviceRunStatisticsMapper;
import com.maibu.service.IDeviceService;
import com.maibu.service.ISysUserClientService;
import com.maibu.service.ISysUserService;
import com.maibu.utils.CommandUtils;
import com.maibu.utils.json.JsonUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;

2
maibu-netty-server/src/main/java/com/maibu/netty/handler/HeaderFooterDecoder.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;

7
maibu-netty-server/src/main/java/com/maibu/netty/handler/HeartbeatHandler.java
View File

@@ -1,11 +1,10 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import com.fastbee.common.Constant;
import com.fastbee.manager.DeviceSessionManager;
import com.maibu.common.Constant;
import com.maibu.manager.DeviceSessionManager;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;

6
maibu-netty-server/src/main/java/com/maibu/netty/handler/HexDecoder.java
View File

@@ -1,7 +1,7 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.Constant;
import com.maibu.common.CommandConstant;
import com.maibu.common.Constant;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;

2
maibu-netty-server/src/main/java/com/maibu/netty/handler/HexEncoder.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.netty.handler;
package com.maibu.netty.handler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;

20
maibu-netty-server/src/main/java/com/maibu/scheduled/ScheduledTask.java
View File

@@ -1,12 +1,11 @@
package com.fastbee.scheduled;
package com.maibu.scheduled;
import com.fastbee.common.NettyCacheKey;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.iot.domain.DeviceStatusRecordDTO;
import com.fastbee.iot.mapper.DevicePlanMapper;
import com.fastbee.iot.mapper.DeviceStatusHistoryMapper;
import com.fastbee.memory.GlobalMemory;
import com.maibu.common.NettyCacheKey;
import com.maibu.core.redis.RedisCache;
import com.maibu.domain.DevicePlan;
import com.maibu.domain.DeviceStatusRecordDTO;
import com.maibu.mapper.DeviceStatusHistoryMapper;
import com.maibu.memory.GlobalMemory;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -28,11 +27,6 @@ public class ScheduledTask {
@Autowired
private DeviceStatusHistoryMapper deviceStatusHistoryMapper;
@Autowired
private GlobalMemory globalMemory;
@Autowired
private DevicePlanMapper devicePlanMapper;
//整点更新设备状态

2
maibu-netty-server/src/main/java/com/maibu/service/DevicePathService.java
View File

@@ -1,4 +1,4 @@
package com.fastbee.service;
package com.maibu.service;
import org.springframework.stereotype.Service;

31
maibu-netty-server/src/main/java/com/maibu/service/DevicePlanTaskMonitorService.java
View File

@@ -1,26 +1,21 @@
package com.fastbee.service;
package com.maibu.service;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.NettyCacheKey;
import com.fastbee.dto.DeviceErrorPushDTO;
import com.fastbee.dto.DeviceErrorPushDetail;
import com.fastbee.dto.NettyDevice;
import com.fastbee.enums.RespondCode;
import com.fastbee.iot.domain.*;
import com.fastbee.iot.enums.DeviceTaskPlanRepeatType;
import com.fastbee.iot.enums.DeviceTaskStaus;
import com.fastbee.iot.mapper.DevicePlanMapper;
import com.fastbee.iot.mapper.DevicePlanTaskMapper;
import com.fastbee.iot.mapper.WorkRecordMapper;
import com.fastbee.iot.model.WorkRecord;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.memory.GlobalMemory;
import com.maibu.domain.DevicePlan;
import com.maibu.domain.DevicePlanTask;
import com.maibu.domain.DeviceTaskPlanRule;
import com.maibu.dto.NettyDevice;
import com.maibu.enums.DeviceTaskPlanRepeatType;
import com.maibu.enums.DeviceTaskStaus;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.mapper.DevicePlanMapper;
import com.maibu.mapper.DevicePlanTaskMapper;
import com.maibu.mapper.WorkRecordMapper;
import com.maibu.memory.GlobalMemory;
import com.maibu.model.WorkRecord;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

35
maibu-netty-server/src/main/java/com/maibu/service/DeviceTaskService.java
View File

@@ -1,28 +1,27 @@
package com.fastbee.service;
package com.maibu.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.dto.DevicePlanStatisticsDTO;
import com.fastbee.dto.DevicePlanTaskStatisticsDTO;
import com.fastbee.dto.DeviceTaskQueryDTO;
import com.fastbee.dto.DeviceWorkStatisticsDTO;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.domain.DevicePlan;
import com.fastbee.iot.domain.DevicePlanTask;
import com.fastbee.iot.domain.DeviceTaskPlanRule;
import com.fastbee.iot.enums.DeviceTaskStaus;
import com.fastbee.iot.mapper.DeviceMapper;
import com.fastbee.iot.mapper.DevicePlanMapper;
import com.fastbee.iot.mapper.DevicePlanTaskMapper;
import com.fastbee.iot.mapper.WorkRecordMapper;
import com.fastbee.iot.model.WorkRecord;
import com.fastbee.memory.GlobalMemory;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.domain.Device;
import com.maibu.domain.DevicePlan;
import com.maibu.domain.DevicePlanTask;
import com.maibu.domain.DeviceTaskPlanRule;
import com.maibu.dto.DevicePlanStatisticsDTO;
import com.maibu.dto.DevicePlanTaskStatisticsDTO;
import com.maibu.dto.DeviceTaskQueryDTO;
import com.maibu.dto.DeviceWorkStatisticsDTO;
import com.maibu.enums.DeviceTaskStaus;
import com.maibu.mapper.DeviceMapper;
import com.maibu.mapper.DevicePlanMapper;
import com.maibu.mapper.DevicePlanTaskMapper;
import com.maibu.mapper.WorkRecordMapper;
import com.maibu.memory.GlobalMemory;
import com.maibu.model.WorkRecord;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate;
import java.time.LocalDateTime;

37
maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java
View File

@@ -1,32 +1,29 @@
package com.fastbee.service;
package com.maibu.service;
import cn.hutool.core.io.IoUtil;
import com.alibaba.fastjson2.JSON;
import com.fastbee.common.CommandConstant;
import com.fastbee.common.NettyCacheKey;
import com.fastbee.common.core.redis.RedisCache;
import com.fastbee.dto.DeviceErrorPushDTO;
import com.fastbee.dto.DeviceErrorPushDetail;
import com.fastbee.dto.NettyDevice;
import com.fastbee.iot.domain.DeviceRunningStatusHistory;
import com.fastbee.entity.ErrorIdentificationStandard;
import com.fastbee.enums.CompareEnum;
import com.fastbee.enums.RespondCode;
import com.fastbee.iot.domain.DeviceStatusRecordDTO;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.mapper.ErrorIdentificationStandardMapper;
import com.fastbee.memory.GlobalMemory;
import com.fastbee.netty.handler.DeviceConnectHandler;
import com.fastbee.utils.CommandUtils;
import com.fastbee.utils.CompareUtils;
import com.maibu.common.CommandConstant;
import com.maibu.common.NettyCacheKey;
import com.maibu.core.redis.RedisCache;
import com.maibu.domain.DeviceRunningStatusHistory;
import com.maibu.domain.DeviceStatusRecordDTO;
import com.maibu.dto.DeviceErrorPushDTO;
import com.maibu.dto.DeviceErrorPushDetail;
import com.maibu.dto.NettyDevice;
import com.maibu.entity.ErrorIdentificationStandard;
import com.maibu.enums.CompareEnum;
import com.maibu.enums.RespondCode;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.mapper.ErrorIdentificationStandardMapper;
import com.maibu.memory.GlobalMemory;
import com.maibu.utils.CommandUtils;
import com.maibu.utils.CompareUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;

10
maibu-netty-server/src/main/java/com/maibu/service/NettyDeviceService.java
View File

@@ -1,10 +1,10 @@
package com.fastbee.service;
package com.maibu.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fastbee.iot.domain.DeviceRunningStatusHistory;
import com.fastbee.entity.ErrorIdentificationStandard;
import com.fastbee.iot.mapper.DeviceStatusHistoryMapper;
import com.fastbee.mapper.ErrorIdentificationStandardMapper;
import com.maibu.domain.DeviceRunningStatusHistory;
import com.maibu.entity.ErrorIdentificationStandard;
import com.maibu.mapper.DeviceStatusHistoryMapper;
import com.maibu.mapper.ErrorIdentificationStandardMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

24
maibu-netty-server/src/main/java/com/maibu/service/TransferDeviceService.java
View File

@@ -1,19 +1,15 @@
package com.fastbee.service;
package com.maibu.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.core.domain.entity.UserClient;
import com.fastbee.common.core.domain.model.LoginUser;
import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.MessageUtils;
import com.fastbee.dto.*;
import com.fastbee.enums.ConnectorStatus;
import com.fastbee.iot.domain.Device;
import com.fastbee.iot.mapper.DeviceMapper;
import com.fastbee.iot.service.IDeviceService;
import com.fastbee.manager.DeviceSessionManager;
import com.fastbee.system.mapper.SysUserClientMapper;
import com.fastbee.system.service.ISysUserClientService;
import com.maibu.core.domain.AjaxResult;
import com.maibu.core.domain.entity.UserClient;
import com.maibu.core.domain.model.LoginUser;
import com.maibu.domain.Device;
import com.maibu.dto.*;
import com.maibu.enums.ConnectorStatus;
import com.maibu.manager.DeviceSessionManager;
import com.maibu.mapper.DeviceMapper;
import com.maibu.mapper.SysUserClientMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

4
maibu-netty-server/src/main/java/com/maibu/utils/CommandUtils.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.utils;
package com.maibu.utils;
import com.fastbee.common.utils.json.JsonUtils;
import com.maibu.utils.json.JsonUtils;
import io.netty.buffer.ByteBuf;
import org.springframework.stereotype.Component;

4
maibu-netty-server/src/main/java/com/maibu/utils/CompareUtils.java
View File

@@ -1,6 +1,6 @@
package com.fastbee.utils;
package com.maibu.utils;
import com.fastbee.enums.CompareEnum;
import com.maibu.enums.CompareEnum;
import lombok.extern.slf4j.Slf4j;
/**