Merge remote-tracking branch 'origin/master'

beidou-admin/pom.xml

@@ -79,12 +79,6 @@
             <artifactId>beidou-generator</artifactId>
         </dependency>
 
-        <!--船舶信息模块-->
-        <dependency>
-            <groupId>cn.com.taiji</groupId>
-            <artifactId>beidou-ship</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/service/impl/FocusShipServiceImpl.java

@@ -1,42 +0,0 @@
-package cn.com.taiji.beidou.service.impl;
-
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.entity.FocusShipEntity;
-import cn.com.taiji.beidou.mapper.BeidouTrackMapper;
-import cn.com.taiji.beidou.mapper.FocusShipMapper;
-import cn.com.taiji.beidou.service.IBeidouTrackService;
-import cn.com.taiji.beidou.service.IFocusShipService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.geotools.data.FeatureReader;
-import org.geotools.data.FeatureWriter;
-import org.geotools.data.Query;
-import org.geotools.data.Transaction;
-import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.feature.simple.SimpleFeatureBuilder;
-import org.geotools.filter.identity.FeatureIdImpl;
-import org.geotools.util.factory.Hints;
-import org.locationtech.geomesa.redis.data.RedisDataStore;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * @Description:
- * @Author: hujie@umisoft.cn
- * @Date: 2021/11/30 9:59 下午
- */
-@Service
-@Slf4j
-public class FocusShipServiceImpl extends ServiceImpl<FocusShipMapper, FocusShipEntity> implements IFocusShipService {
-
-}

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/GeoServerApplication.java

@@ -1,10 +1,7 @@
-package cn.com.taiji.beidou;
+package cn.com.taiji.track;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author chenfangchao

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/config/AbstractRedisDataStoreConfig.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.config;
+package cn.com.taiji.track.config;
 
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
+import cn.com.taiji.track.dto.IGeomesaTrackDTO;
 import org.geotools.data.DataStoreFinder;
 import org.locationtech.geomesa.redis.data.RedisDataStore;
 import org.opengis.feature.simple.SimpleFeatureType;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/config/BeidouShipRedisDataStoreConfig.java

@@ -1,7 +1,7 @@
-package cn.com.taiji.beidou.config;
+package cn.com.taiji.track.config;
 
-import cn.com.taiji.beidou.dto.BeidouShipTrackDTO;
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
+import cn.com.taiji.track.dto.BeidouShipTrackDTO;
+import cn.com.taiji.track.dto.IGeomesaTrackDTO;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.locationtech.geomesa.redis.data.RedisDataStore;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/config/NettyConfig.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.config;
+package cn.com.taiji.track.config;
 
 import io.netty.channel.Channel;
 import io.netty.channel.group.ChannelGroup;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/config/RedisConfig.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.config;
+package cn.com.taiji.track.config;
 
-import cn.com.taiji.beidou.serializer.FastJson2JsonRedisSerializer;
+import cn.com.taiji.track.serializer.FastJson2JsonRedisSerializer;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/constants/ConstantsUtil.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.constants;
+package cn.com.taiji.track.constants;
 
 /**
  * @author wudskq

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/constants/TopicConstants.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.constants;
+package cn.com.taiji.track.constants;
 
 /**
  * @author chenfangchao

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/consumer/BeidouShipTrackConsumer.java

@@ -1,12 +1,11 @@
-package cn.com.taiji.beidou.consumer;
+package cn.com.taiji.track.consumer;
 
-import cn.com.taiji.beidou.service.IBeidouTrackService;
+import cn.com.taiji.track.service.IBeidouTrackService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.annotation.TopicPartition;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.stereotype.Component;
 

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/controller/BeidouController.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.controller;
+package cn.com.taiji.track.controller;
 
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.web.bind.annotation.GetMapping;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/dto/BeidouShipTrackDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.dto;
+package cn.com.taiji.track.dto;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/dto/FocusTrackQueryDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.dto;
+package cn.com.taiji.track.dto;
 
 import com.alibaba.fastjson.JSON;
 import lombok.Data;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/dto/HistoryTrackQueryDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.dto;
+package cn.com.taiji.track.dto;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/dto/IGeomesaTrackDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.dto;
+package cn.com.taiji.track.dto;
 
 import org.geotools.feature.simple.SimpleFeatureBuilder;
 import org.opengis.feature.simple.SimpleFeature;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.entity;
+package cn.com.taiji.track.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/entity/BeidouTrackEntity.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.entity;
+package cn.com.taiji.track.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/entity/FocusShipEntity.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.entity;
+package cn.com.taiji.track.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/ChannelAddEvent.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelId;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/ChannelRemoveEvent.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
 import io.netty.channel.ChannelId;
 import org.springframework.context.ApplicationEvent;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/EventType.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
 
 import java.io.Serializable;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/FocusTrackChannelAddEvent.java

@@ -1,7 +1,6 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
-import cn.com.taiji.beidou.dto.FocusTrackQueryDTO;
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
+import cn.com.taiji.track.dto.FocusTrackQueryDTO;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelId;
 import org.springframework.context.ApplicationEvent;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/FocusTrackChannelRemoveEvent.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
 import io.netty.channel.ChannelId;
 import org.springframework.context.ApplicationEvent;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/HistoryTrackChannelAddEvent.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
+import cn.com.taiji.track.dto.HistoryTrackQueryDTO;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelId;
 import org.springframework.context.ApplicationEvent;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/event/HistoryTrackChannelRemoveEvent.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.event;
+package cn.com.taiji.track.event;
 
 import io.netty.channel.ChannelId;
 import org.springframework.context.ApplicationEvent;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/handler/FocusTrackHandler.java

@@ -1,12 +1,9 @@
-package cn.com.taiji.beidou.handler;
+package cn.com.taiji.track.handler;
 
-import cn.com.taiji.beidou.config.NettyConfig;
-import cn.com.taiji.beidou.dto.FocusTrackQueryDTO;
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
-import cn.com.taiji.beidou.event.FocusTrackChannelAddEvent;
-import cn.com.taiji.beidou.event.FocusTrackChannelRemoveEvent;
-import cn.com.taiji.beidou.event.HistoryTrackChannelAddEvent;
-import cn.com.taiji.beidou.event.HistoryTrackChannelRemoveEvent;
+import cn.com.taiji.track.config.NettyConfig;
+import cn.com.taiji.track.dto.FocusTrackQueryDTO;
+import cn.com.taiji.track.event.FocusTrackChannelAddEvent;
+import cn.com.taiji.track.event.FocusTrackChannelRemoveEvent;
 import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/handler/HistoryTrackHandler.java

@@ -1,13 +1,9 @@
-package cn.com.taiji.beidou.handler;
+package cn.com.taiji.track.handler;
 
-import cn.com.taiji.beidou.config.NettyConfig;
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.event.ChannelAddEvent;
-import cn.com.taiji.beidou.event.ChannelRemoveEvent;
-import cn.com.taiji.beidou.event.HistoryTrackChannelAddEvent;
-import cn.com.taiji.beidou.event.HistoryTrackChannelRemoveEvent;
-import com.alibaba.fastjson.JSON;
+import cn.com.taiji.track.config.NettyConfig;
+import cn.com.taiji.track.dto.HistoryTrackQueryDTO;
+import cn.com.taiji.track.event.HistoryTrackChannelAddEvent;
+import cn.com.taiji.track.event.HistoryTrackChannelRemoveEvent;
 import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;
@@ -24,7 +20,6 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
 import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 /**

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/handler/WebSocketHandler.java

@@ -1,8 +1,8 @@
-package cn.com.taiji.beidou.handler;
+package cn.com.taiji.track.handler;
 
-import cn.com.taiji.beidou.config.NettyConfig;
-import cn.com.taiji.beidou.event.ChannelAddEvent;
-import cn.com.taiji.beidou.event.ChannelRemoveEvent;
+import cn.com.taiji.track.config.NettyConfig;
+import cn.com.taiji.track.event.ChannelAddEvent;
+import cn.com.taiji.track.event.ChannelRemoveEvent;
 import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.*;
 import io.netty.channel.group.ChannelGroup;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/listener/ChannelListener.java

@@ -1,10 +1,10 @@
-package cn.com.taiji.beidou.listener;
+package cn.com.taiji.track.listener;
 
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
-import cn.com.taiji.beidou.event.ChannelAddEvent;
-import cn.com.taiji.beidou.event.ChannelRemoveEvent;
-import cn.com.taiji.beidou.event.EventType;
-import cn.com.taiji.beidou.handler.WebSocketHandler;
+import cn.com.taiji.track.dto.IGeomesaTrackDTO;
+import cn.com.taiji.track.event.ChannelAddEvent;
+import cn.com.taiji.track.event.ChannelRemoveEvent;
+import cn.com.taiji.track.event.EventType;
+import cn.com.taiji.track.handler.WebSocketHandler;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/listener/FocusTrackChannelListener.java

@@ -1,22 +1,18 @@
-package cn.com.taiji.beidou.listener;
+package cn.com.taiji.track.listener;
 
-import cn.com.taiji.beidou.dto.FocusTrackQueryDTO;
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.entity.FocusShipEntity;
-import cn.com.taiji.beidou.event.ChannelRemoveEvent;
-import cn.com.taiji.beidou.event.EventType;
-import cn.com.taiji.beidou.event.FocusTrackChannelAddEvent;
-import cn.com.taiji.beidou.event.HistoryTrackChannelAddEvent;
-import cn.com.taiji.beidou.handler.HistoryTrackHandler;
-import cn.com.taiji.beidou.service.IBeidouTrackService;
-import cn.com.taiji.beidou.service.IFocusShipService;
+import cn.com.taiji.track.dto.FocusTrackQueryDTO;
+import cn.com.taiji.track.dto.IGeomesaTrackDTO;
+import cn.com.taiji.track.entity.FocusShipEntity;
+import cn.com.taiji.track.event.ChannelRemoveEvent;
+import cn.com.taiji.track.event.EventType;
+import cn.com.taiji.track.event.FocusTrackChannelAddEvent;
+import cn.com.taiji.track.handler.HistoryTrackHandler;
+import cn.com.taiji.track.service.IBeidouTrackService;
+import cn.com.taiji.track.service.IFocusShipService;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.util.AttributeKey;
 import lombok.extern.slf4j.Slf4j;
 import org.geotools.data.FeatureReader;
@@ -25,7 +21,6 @@ import org.geotools.data.Transaction;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.filter.text.cql2.CQL;
 import org.geotools.filter.text.cql2.CQLException;
-import org.geotools.filter.text.ecql.ECQL;
 import org.locationtech.geomesa.redis.data.RedisDataStore;
 import org.locationtech.jts.geom.Geometry;
 import org.opengis.feature.Property;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/listener/HistoryTrackChannelListener.java

@@ -1,42 +1,22 @@
-package cn.com.taiji.beidou.listener;
+package cn.com.taiji.track.listener;
 
-import cn.com.taiji.beidou.dto.HistoryTrackQueryDTO;
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.entity.FocusShipEntity;
-import cn.com.taiji.beidou.event.ChannelAddEvent;
-import cn.com.taiji.beidou.event.ChannelRemoveEvent;
-import cn.com.taiji.beidou.event.EventType;
-import cn.com.taiji.beidou.event.HistoryTrackChannelAddEvent;
-import cn.com.taiji.beidou.handler.HistoryTrackHandler;
-import cn.com.taiji.beidou.handler.WebSocketHandler;
-import cn.com.taiji.beidou.service.IBeidouTrackService;
-import cn.com.taiji.beidou.service.IFocusShipService;
-import cn.hutool.json.JSONArray;
+import cn.com.taiji.track.dto.HistoryTrackQueryDTO;
+import cn.com.taiji.track.entity.BeidouTrackEntity;
+import cn.com.taiji.track.event.HistoryTrackChannelAddEvent;
+import cn.com.taiji.track.handler.HistoryTrackHandler;
+import cn.com.taiji.track.service.IBeidouTrackService;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.util.AttributeKey;
 import lombok.extern.slf4j.Slf4j;
-import org.geotools.data.FeatureReader;
-import org.geotools.data.Query;
-import org.geotools.data.Transaction;
-import org.geotools.filter.text.cql2.CQLException;
-import org.geotools.filter.text.ecql.ECQL;
-import org.locationtech.geomesa.redis.data.RedisDataStore;
-import org.locationtech.jts.geom.Geometry;
-import org.opengis.feature.Property;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
 

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/mapper/BeidouTrackMapper.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.mapper;
+package cn.com.taiji.track.mapper;
 
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
+import cn.com.taiji.track.entity.BeidouTrackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/mapper/FocusShipMapper.java

@@ -1,7 +1,6 @@
-package cn.com.taiji.beidou.mapper;
+package cn.com.taiji.track.mapper;
 
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.entity.FocusShipEntity;
+import cn.com.taiji.track.entity.FocusShipEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/producer/BeidouShipTestProducer.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.producer;
+package cn.com.taiji.track.producer;
 
-import cn.com.taiji.beidou.dto.BeidouShipTrackDTO;
+import cn.com.taiji.track.dto.BeidouShipTrackDTO;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/serializer/FastJson2JsonRedisSerializer.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.serializer;
+package cn.com.taiji.track.serializer;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.parser.ParserConfig;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/server/FocusTrackServer.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.server;
+package cn.com.taiji.track.server;
 
-import cn.com.taiji.beidou.handler.FocusTrackHandler;
+import cn.com.taiji.track.handler.FocusTrackHandler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/server/HistoryTrackServer.java

@@ -1,7 +1,6 @@
-package cn.com.taiji.beidou.server;
+package cn.com.taiji.track.server;
 
-import cn.com.taiji.beidou.handler.HistoryTrackHandler;
-import cn.com.taiji.beidou.handler.WebSocketHandler;
+import cn.com.taiji.track.handler.HistoryTrackHandler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/server/NettyServer.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.server;
+package cn.com.taiji.track.server;
 
-import cn.com.taiji.beidou.handler.WebSocketHandler;
+import cn.com.taiji.track.handler.WebSocketHandler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/service/IBeidouTrackService.java

@@ -1,6 +1,6 @@
-package cn.com.taiji.beidou.service;
+package cn.com.taiji.track.service;
 
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
+import cn.com.taiji.track.entity.BeidouTrackEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/service/IFocusShipService.java

@@ -1,11 +1,7 @@
-package cn.com.taiji.beidou.service;
+package cn.com.taiji.track.service;
 
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.entity.FocusShipEntity;
+import cn.com.taiji.track.entity.FocusShipEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-
-import java.util.List;
 
 /**
  * @Description:

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/service/impl/BeidouTrackServiceImpl.java

@@ -1,10 +1,9 @@
-package cn.com.taiji.beidou.service.impl;
+package cn.com.taiji.track.service.impl;
 
-import cn.com.taiji.beidou.dto.BeidouShipTrackDTO;
-import cn.com.taiji.beidou.dto.IGeomesaTrackDTO;
-import cn.com.taiji.beidou.entity.BeidouTrackEntity;
-import cn.com.taiji.beidou.mapper.BeidouTrackMapper;
-import cn.com.taiji.beidou.service.IBeidouTrackService;
+import cn.com.taiji.track.dto.IGeomesaTrackDTO;
+import cn.com.taiji.track.entity.BeidouTrackEntity;
+import cn.com.taiji.track.mapper.BeidouTrackMapper;
+import cn.com.taiji.track.service.IBeidouTrackService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;

beidou-track-geomesa/src/main/java/cn/com/taiji/track/service/impl/FocusShipServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.taiji.track.service.impl;
+
+import cn.com.taiji.track.entity.FocusShipEntity;
+import cn.com.taiji.track.mapper.FocusShipMapper;
+import cn.com.taiji.track.service.IFocusShipService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:
+ * @Author: hujie@umisoft.cn
+ * @Date: 2021/11/30 9:59 下午
+ */
+@Service
+@Slf4j
+public class FocusShipServiceImpl extends ServiceImpl<FocusShipMapper, FocusShipEntity> implements IFocusShipService {
+
+}

beidou-track-geomesa/src/main/java/cn/com/taiji/beidou/utils/RandomGroup.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.beidou.utils;
+package cn.com.taiji.track.utils;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.unit.DataUnit;