[update]0.7版本

.idea/workspace.xml

@@ -4,8 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[insert]新增融合解析--识别融合数据率波动问题导出">
-      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/OriginalData.java" afterDir="false" />
+    <list default="true" id="3bf79822-fe13-41ea-bc8f-858fbea129e7" name="Changes" comment="[update]0.7版本">
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/BeiDouOriginal.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/FuseOriginal.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/TargetSource.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/domain/TianAoOriginal.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java" beforeDir="false" afterPath="$PROJECT_DIR$/fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java" afterDir="false" />
@@ -26,7 +29,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="chenfangchao" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -157,7 +160,7 @@
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
         <item itemvalue="应用程序.text" />
         <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
-        <item itemvalue="Spring Boot.EsTrackAnAlySisApplication" />
+        <item itemvalue="应用程序.text" />
       </list>
     </recent_temporary>
   </component>

fusion-analysis/src/main/java/cn/com/taiji/controller/FusionAnalysisController.java

@@ -121,7 +121,7 @@ public class FusionAnalysisController {
 
 
     /**
-     * 轨迹融合-导出融合原始数据
+     * 轨迹融合-导出融合原始数据统计
      * @param query
      * @param response
      * @throws IOException
@@ -133,7 +133,7 @@ public class FusionAnalysisController {
     }
 
     /**
-     * 轨迹融合-导出北斗原始数据
+     * 轨迹融合-导出北斗原始数据统计
      * @param query
      * @param response
      * @throws IOException
@@ -145,7 +145,7 @@ public class FusionAnalysisController {
     }
 
     /**
-     * 轨迹融合-导出天奥原始数据
+     * 轨迹融合-导出天奥原始数据统计
      * @param query
      * @param response
      * @throws IOException
@@ -155,4 +155,41 @@ public class FusionAnalysisController {
     public void fusionAnalysisExcelOriginalThree(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
         fusionAnalysisService.fusionAnalysisExcelOriginalThree(query,response);
     }
+
+    /**
+     * 轨迹融合-导出融合原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/four")
+    public void fusionAnalysisExcelOriginalFour(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalFour(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出北斗原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/five")
+    public void fusionAnalysisExcelOriginalFive(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalFive(query,response);
+    }
+
+    /**
+     * 轨迹融合-导出天奥原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    @PostMapping("excel/original/six")
+    public void fusionAnalysisExcelOriginalSix(@RequestBody FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        fusionAnalysisService.fusionAnalysisExcelOriginalSix(query,response);
+    }
+
 }

fusion-analysis/src/main/java/cn/com/taiji/domain/BeiDouOriginal.java

@@ -0,0 +1,210 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * @author xhl
+ */
+public class BeiDouOriginal {
+    @ExcelProperty(value = "gisShipUse")
+    private String gisShipUse;
+    @ExcelProperty(value = "latitude")
+    private String latitude;
+    @ExcelProperty(value = "isOnline")
+    private String isOnline;
+    @ExcelProperty(value = "devideNo")
+    private String devideNo;
+    @ExcelProperty(value = "shipName")
+    private String shipName;
+    @ExcelProperty(value = "speed")
+    private int speed;
+    @ExcelProperty(value = "shipLength")
+    private double shipLength;
+    @ExcelProperty(value = "texTure")
+    private String texTure;
+    @ExcelProperty(value = "shiptracktime")
+    private String shiptracktime;
+    @ExcelProperty(value = "course")
+    private String course;
+    @ExcelProperty(value = "jobWay")
+    private String jobWay;
+    @ExcelProperty(value = "jobType")
+    private String jobType;
+    @ExcelProperty(value = "shipId")
+    private String shipId;
+    @ExcelProperty(value = "longitude")
+    private String longitude;
+    @ExcelProperty(value = "locationTime")
+    private String locationTime;
+    @ExcelProperty(value = "gisShipPort")
+    private String gisShipPort;
+    @ExcelProperty(value = "electricity")
+    private String electricity;
+    @ExcelProperty(value = "shipWidth")
+    private String shipWidth;
+    @ExcelProperty(value = "gisShipMaterial")
+    private String gisShipMaterial;
+    @ExcelProperty(value = "sendTime")
+    private String sendTime;
+    @ExcelProperty(value = "shipMaterial")
+    private String shipMaterial;
+    @ExcelProperty(value = "shipTrack")
+    private String shipTrack;
+    @ExcelProperty(value = "locationid")
+    private String locationid;
+    @ExcelProperty(value = "shipType")
+    private String shipType;
+    @ExcelProperty(value = "location")
+    private String location;
+
+    public void setGisShipUse(String gisShipUse){
+        this.gisShipUse = gisShipUse;
+    }
+    public String getGisShipUse(){
+        return this.gisShipUse;
+    }
+    public void setLatitude(String latitude){
+        this.latitude = latitude;
+    }
+    public String getLatitude(){
+        return this.latitude;
+    }
+    public void setIsOnline(String isOnline){
+        this.isOnline = isOnline;
+    }
+    public String getIsOnline(){
+        return this.isOnline;
+    }
+    public void setDevideNo(String devideNo){
+        this.devideNo = devideNo;
+    }
+    public String getDevideNo(){
+        return this.devideNo;
+    }
+    public void setShipName(String shipName){
+        this.shipName = shipName;
+    }
+    public String getShipName(){
+        return this.shipName;
+    }
+    public void setSpeed(int speed){
+        this.speed = speed;
+    }
+    public int getSpeed(){
+        return this.speed;
+    }
+    public void setShipLength(double shipLength){
+        this.shipLength = shipLength;
+    }
+    public double getShipLength(){
+        return this.shipLength;
+    }
+    public void setTexTure(String texTure){
+        this.texTure = texTure;
+    }
+    public String getTexTure(){
+        return this.texTure;
+    }
+    public void setShiptracktime(String shiptracktime){
+        this.shiptracktime = shiptracktime;
+    }
+    public String getShiptracktime(){
+        return this.shiptracktime;
+    }
+    public void setCourse(String course){
+        this.course = course;
+    }
+    public String getCourse(){
+        return this.course;
+    }
+    public void setJobWay(String jobWay){
+        this.jobWay = jobWay;
+    }
+    public String getJobWay(){
+        return this.jobWay;
+    }
+    public void setJobType(String jobType){
+        this.jobType = jobType;
+    }
+    public String getJobType(){
+        return this.jobType;
+    }
+    public void setShipId(String shipId){
+        this.shipId = shipId;
+    }
+    public String getShipId(){
+        return this.shipId;
+    }
+    public void setLongitude(String longitude){
+        this.longitude = longitude;
+    }
+    public String getLongitude(){
+        return this.longitude;
+    }
+    public void setLocationTime(String locationTime){
+        this.locationTime = locationTime;
+    }
+    public String getLocationTime(){
+        return this.locationTime;
+    }
+    public void setGisShipPort(String gisShipPort){
+        this.gisShipPort = gisShipPort;
+    }
+    public String getGisShipPort(){
+        return this.gisShipPort;
+    }
+    public void setElectricity(String electricity){
+        this.electricity = electricity;
+    }
+    public String getElectricity(){
+        return this.electricity;
+    }
+    public void setShipWidth(String shipWidth){
+        this.shipWidth = shipWidth;
+    }
+    public String getShipWidth(){
+        return this.shipWidth;
+    }
+    public void setGisShipMaterial(String gisShipMaterial){
+        this.gisShipMaterial = gisShipMaterial;
+    }
+    public String getGisShipMaterial(){
+        return this.gisShipMaterial;
+    }
+    public void setSendTime(String sendTime){
+        this.sendTime = sendTime;
+    }
+    public String getSendTime(){
+        return this.sendTime;
+    }
+    public void setShipMaterial(String shipMaterial){
+        this.shipMaterial = shipMaterial;
+    }
+    public String getShipMaterial(){
+        return this.shipMaterial;
+    }
+    public void setShipTrack(String shipTrack){
+        this.shipTrack = shipTrack;
+    }
+    public String getShipTrack(){
+        return this.shipTrack;
+    }
+    public void setLocationid(String locationid){
+        this.locationid = locationid;
+    }
+    public String getLocationid(){
+        return this.locationid;
+    }
+    public void setShipType(String shipType){
+        this.shipType = shipType;
+    }
+    public String getShipType(){
+        return this.shipType;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+}

fusion-analysis/src/main/java/cn/com/taiji/domain/FuseOriginal.java

@@ -0,0 +1,268 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import java.util.List;
+
+/**
+ * @author xhl
+ */
+public class FuseOriginal {
+    @ExcelProperty(value = "targetName")
+    private String targetName;
+    @ExcelProperty(value = "supplyIceWaterAreaId")
+    private String supplyIceWaterAreaId;
+    @ExcelProperty(value = "portState")
+    private String portState;
+    @ExcelProperty(value = "targetHeading")
+    private String targetHeading;
+    @ExcelProperty(value = "portId")
+    private String portId;
+    @ExcelProperty(value = "mergeTarget")
+    private String mergeTarget;
+    @ExcelProperty(value = "targetTrackState")
+    private String targetTrackState;
+    @ExcelProperty(value = "targetShipType")
+    private String targetShipType;
+    @ExcelProperty(value = "targetSource")
+    private String targetSource;
+    @ExcelProperty(value = "gisNationality")
+    private String gisNationality;
+    @ExcelProperty(value = "targetState")
+    private String targetState;
+    @ExcelProperty(value = "targetLength")
+    private int targetLength;
+    @ExcelProperty(value = "targetTrackTime")
+    private String targetTrackTime;
+    @ExcelProperty(value = "motionState")
+    private String motionState;
+    @ExcelProperty(value = "mergeTime")
+    private String mergeTime;
+    @ExcelProperty(value = "targetSpeed")
+    private double targetSpeed;
+    @ExcelProperty(value = "mergeId")
+    private String mergeId;
+    @ExcelProperty(value = "targetRot")
+    private String targetRot;
+    @ExcelProperty(value = "mergeType")
+    private String mergeType;
+    @ExcelProperty(value = "targetType")
+    private String targetType;
+    @ExcelProperty(value = "gisShipType")
+    private String gisShipType;
+    @ExcelProperty(value = "supplyIceWaterState")
+    private String supplyIceWaterState;
+    @ExcelProperty(value = "refueledAreaId")
+    private String refueledAreaId;
+    @ExcelProperty(value = "targetNameEn")
+    private String targetNameEn;
+    @ExcelProperty(value = "refueledState")
+    private String refueledState;
+    @ExcelProperty(value = "targetMonitorId")
+    private String targetMonitorId;
+    @ExcelProperty(value = "targetDraught")
+    private String targetDraught;
+    @ExcelProperty(value = "trackDeviceNo")
+    private String trackDeviceNo;
+    @ExcelProperty(value = "targetCourse")
+    private String targetCourse;
+    @ExcelProperty(value = "targetNationality")
+    private String targetNationality;
+    @ExcelProperty(value = "location")
+    private String location;
+    @ExcelProperty(value = "targetTypeReliability")
+    private int targetTypeReliability;
+
+    public void setTargetName(String targetName){
+        this.targetName = targetName;
+    }
+    public String getTargetName(){
+        return this.targetName;
+    }
+    public void setSupplyIceWaterAreaId(String supplyIceWaterAreaId){
+        this.supplyIceWaterAreaId = supplyIceWaterAreaId;
+    }
+    public String getSupplyIceWaterAreaId(){
+        return this.supplyIceWaterAreaId;
+    }
+    public void setPortState(String portState){
+        this.portState = portState;
+    }
+    public String getPortState(){
+        return this.portState;
+    }
+    public void setTargetHeading(String targetHeading){
+        this.targetHeading = targetHeading;
+    }
+    public String getTargetHeading(){
+        return this.targetHeading;
+    }
+    public void setPortId(String portId){
+        this.portId = portId;
+    }
+    public String getPortId(){
+        return this.portId;
+    }
+    public void setMergeTarget(String mergeTarget){
+        this.mergeTarget = mergeTarget;
+    }
+    public String getMergeTarget(){
+        return this.mergeTarget;
+    }
+    public void setTargetTrackState(String targetTrackState){
+        this.targetTrackState = targetTrackState;
+    }
+    public String getTargetTrackState(){
+        return this.targetTrackState;
+    }
+    public void setTargetShipType(String targetShipType){
+        this.targetShipType = targetShipType;
+    }
+    public String getTargetShipType(){
+        return this.targetShipType;
+    }
+    public void setTargetSource(String targetSource){
+        this.targetSource = targetSource;
+    }
+    public String getTargetSource(){
+        return this.targetSource;
+    }
+    public void setGisNationality(String gisNationality){
+        this.gisNationality = gisNationality;
+    }
+    public String getGisNationality(){
+        return this.gisNationality;
+    }
+    public void setTargetState(String targetState){
+        this.targetState = targetState;
+    }
+    public String getTargetState(){
+        return this.targetState;
+    }
+    public void setTargetLength(int targetLength){
+        this.targetLength = targetLength;
+    }
+    public int getTargetLength(){
+        return this.targetLength;
+    }
+    public void setTargetTrackTime(String targetTrackTime){
+        this.targetTrackTime = targetTrackTime;
+    }
+    public String getTargetTrackTime(){
+        return this.targetTrackTime;
+    }
+    public void setMotionState(String motionState){
+        this.motionState = motionState;
+    }
+    public String getMotionState(){
+        return this.motionState;
+    }
+    public void setMergeTime(String mergeTime){
+        this.mergeTime = mergeTime;
+    }
+    public String getMergeTime(){
+        return this.mergeTime;
+    }
+    public void setTargetSpeed(double targetSpeed){
+        this.targetSpeed = targetSpeed;
+    }
+    public double getTargetSpeed(){
+        return this.targetSpeed;
+    }
+    public void setMergeId(String mergeId){
+        this.mergeId = mergeId;
+    }
+    public String getMergeId(){
+        return this.mergeId;
+    }
+    public void setTargetRot(String targetRot){
+        this.targetRot = targetRot;
+    }
+    public String getTargetRot(){
+        return this.targetRot;
+    }
+    public void setMergeType(String mergeType){
+        this.mergeType = mergeType;
+    }
+    public String getMergeType(){
+        return this.mergeType;
+    }
+    public void setTargetType(String targetType){
+        this.targetType = targetType;
+    }
+    public String getTargetType(){
+        return this.targetType;
+    }
+    public void setGisShipType(String gisShipType){
+        this.gisShipType = gisShipType;
+    }
+    public String getGisShipType(){
+        return this.gisShipType;
+    }
+    public void setSupplyIceWaterState(String supplyIceWaterState){
+        this.supplyIceWaterState = supplyIceWaterState;
+    }
+    public String getSupplyIceWaterState(){
+        return this.supplyIceWaterState;
+    }
+    public void setRefueledAreaId(String refueledAreaId){
+        this.refueledAreaId = refueledAreaId;
+    }
+    public String getRefueledAreaId(){
+        return this.refueledAreaId;
+    }
+    public void setTargetNameEn(String targetNameEn){
+        this.targetNameEn = targetNameEn;
+    }
+    public String getTargetNameEn(){
+        return this.targetNameEn;
+    }
+    public void setRefueledState(String refueledState){
+        this.refueledState = refueledState;
+    }
+    public String getRefueledState(){
+        return this.refueledState;
+    }
+    public void setTargetMonitorId(String targetMonitorId){
+        this.targetMonitorId = targetMonitorId;
+    }
+    public String getTargetMonitorId(){
+        return this.targetMonitorId;
+    }
+    public void setTargetDraught(String targetDraught){
+        this.targetDraught = targetDraught;
+    }
+    public String getTargetDraught(){
+        return this.targetDraught;
+    }
+    public void setTrackDeviceNo(String trackDeviceNo){
+        this.trackDeviceNo = trackDeviceNo;
+    }
+    public String getTrackDeviceNo(){
+        return this.trackDeviceNo;
+    }
+    public void setTargetCourse(String targetCourse){
+        this.targetCourse = targetCourse;
+    }
+    public String getTargetCourse(){
+        return this.targetCourse;
+    }
+    public void setTargetNationality(String targetNationality){
+        this.targetNationality = targetNationality;
+    }
+    public String getTargetNationality(){
+        return this.targetNationality;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+    public void setTargetTypeReliability(int targetTypeReliability){
+        this.targetTypeReliability = targetTypeReliability;
+    }
+    public int getTargetTypeReliability(){
+        return this.targetTypeReliability;
+    }
+}

fusion-analysis/src/main/java/cn/com/taiji/domain/TargetSource.java

@@ -0,0 +1,40 @@
+package cn.com.taiji.domain;
+
+/**
+ * @author xhl
+ */
+public class TargetSource {
+
+    private String track_id;
+
+    private String id;
+
+    private String time;
+
+    private String type;
+
+    public void setTrack_id(String track_id){
+        this.track_id = track_id;
+    }
+    public String getTrack_id(){
+        return this.track_id;
+    }
+    public void setId(String id){
+        this.id = id;
+    }
+    public String getId(){
+        return this.id;
+    }
+    public void setTime(String time){
+        this.time = time;
+    }
+    public String getTime(){
+        return this.time;
+    }
+    public void setType(String type){
+        this.type = type;
+    }
+    public String getType(){
+        return this.type;
+    }
+}

fusion-analysis/src/main/java/cn/com/taiji/domain/TianAoOriginal.java

@@ -0,0 +1,163 @@
+package cn.com.taiji.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+/**
+ * @author xhl
+ */
+public class TianAoOriginal {
+
+    @ExcelProperty(value = "altitude")
+    private String altitude;
+    @ExcelProperty(value = "collectTime")
+    private String collectTime;
+    @ExcelProperty(value = "reliability")
+    private int reliability;
+    @ExcelProperty(value = "fusionBatchNum")
+    private String fusionBatchNum;
+    @ExcelProperty(value = "targetProper")
+    private String targetProper;
+    @ExcelProperty(value = "shipName")
+    private String shipName;
+    @ExcelProperty(value = "fusionTime")
+    private String fusionTime;
+    @ExcelProperty(value = "speed")
+    private double speed;
+    @ExcelProperty(value = "receiveTime")
+    private String receiveTime;
+    @ExcelProperty(value = "traceState")
+    private String traceState;
+    @ExcelProperty(value = "targetSize")
+    private int targetSize;
+    @ExcelProperty(value = "radarCode")
+    private String radarCode;
+    @ExcelProperty(value = "shipTrack")
+    private String shipTrack;
+    @ExcelProperty(value = "shiptracktime")
+    private String shiptracktime;
+    @ExcelProperty(value = "course")
+    private String course;
+    @ExcelProperty(value = "location")
+    private String location;
+    @ExcelProperty(value = "id")
+    private String id;
+    @ExcelProperty(value = "shipId")
+    private String shipId;
+    @ExcelProperty(value = "longitude")
+    private String longitude;
+
+    public void setAltitude(String altitude){
+        this.altitude = altitude;
+    }
+    public String getAltitude(){
+        return this.altitude;
+    }
+    public void setCollectTime(String collectTime){
+        this.collectTime = collectTime;
+    }
+    public String getCollectTime(){
+        return this.collectTime;
+    }
+    public void setReliability(int reliability){
+        this.reliability = reliability;
+    }
+    public int getReliability(){
+        return this.reliability;
+    }
+    public void setFusionBatchNum(String fusionBatchNum){
+        this.fusionBatchNum = fusionBatchNum;
+    }
+    public String getFusionBatchNum(){
+        return this.fusionBatchNum;
+    }
+    public void setTargetProper(String targetProper){
+        this.targetProper = targetProper;
+    }
+    public String getTargetProper(){
+        return this.targetProper;
+    }
+    public void setShipName(String shipName){
+        this.shipName = shipName;
+    }
+    public String getShipName(){
+        return this.shipName;
+    }
+    public void setFusionTime(String fusionTime){
+        this.fusionTime = fusionTime;
+    }
+    public String getFusionTime(){
+        return this.fusionTime;
+    }
+    public void setSpeed(double speed){
+        this.speed = speed;
+    }
+    public double getSpeed(){
+        return this.speed;
+    }
+    public void setReceiveTime(String receiveTime){
+        this.receiveTime = receiveTime;
+    }
+    public String getReceiveTime(){
+        return this.receiveTime;
+    }
+    public void setTraceState(String traceState){
+        this.traceState = traceState;
+    }
+    public String getTraceState(){
+        return this.traceState;
+    }
+    public void setTargetSize(int targetSize){
+        this.targetSize = targetSize;
+    }
+    public int getTargetSize(){
+        return this.targetSize;
+    }
+    public void setRadarCode(String radarCode){
+        this.radarCode = radarCode;
+    }
+    public String getRadarCode(){
+        return this.radarCode;
+    }
+    public void setShipTrack(String shipTrack){
+        this.shipTrack = shipTrack;
+    }
+    public String getShipTrack(){
+        return this.shipTrack;
+    }
+    public void setShiptracktime(String shiptracktime){
+        this.shiptracktime = shiptracktime;
+    }
+    public String getShiptracktime(){
+        return this.shiptracktime;
+    }
+    public void setCourse(String course){
+        this.course = course;
+    }
+    public String getCourse(){
+        return this.course;
+    }
+    public void setLocation(String location){
+        this.location = location;
+    }
+    public String getLocation(){
+        return this.location;
+    }
+    public void setId(String id){
+        this.id = id;
+    }
+    public String getId(){
+        return this.id;
+    }
+    public void setShipId(String shipId){
+        this.shipId = shipId;
+    }
+    public String getShipId(){
+        return this.shipId;
+    }
+    public void setLongitude(String longitude){
+        this.longitude = longitude;
+    }
+    public String getLongitude(){
+        return this.longitude;
+    }
+}

fusion-analysis/src/main/java/cn/com/taiji/service/FusionAnalysisService.java

@@ -85,7 +85,7 @@ public interface FusionAnalysisService {
     void fusionAnalysisExcelFour(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
 
     /**
-     * 导出融合原始数据
+     * 导出融合原始数据统计
      * @param query
      * @param response
      * @throws IOException
@@ -94,7 +94,7 @@ public interface FusionAnalysisService {
     void fusionAnalysisExcelOriginalOne(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
 
     /**
-     * 导出北斗原始数据
+     * 导出北斗原始数据统计
      * @param query
      * @param response
      * @throws IOException
@@ -103,11 +103,39 @@ public interface FusionAnalysisService {
     void fusionAnalysisExcelOriginalTwo(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
 
     /**
-     * 导出天奥原始数据
+     * 导出天奥原始数据统计
      * @param query
      * @param response
      * @throws IOException
      * @throws ParseException
      */
     void fusionAnalysisExcelOriginalThree(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    /**
+     * 导出融合原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    void fusionAnalysisExcelOriginalFour(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    /**
+     * 导出北斗原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    void fusionAnalysisExcelOriginalFive(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
+    /**
+     * 导出天奥原始数据
+     * @param query
+     * @param response
+     * @throws IOException
+     * @throws ParseException
+     */
+    void fusionAnalysisExcelOriginalSix(FusionQuery query, HttpServletResponse response) throws IOException, ParseException;
+
 }

fusion-analysis/src/main/java/cn/com/taiji/service/impl/FusionAnalysisServiceImpl.java

@@ -1139,16 +1139,16 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             }
         });
         try {
-            System.out.println("导出融合原始数据");
+            System.out.println("导出融合原始数据统计");
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("utf-8");
-            String fileName = URLEncoder.encode("融合原始数据", "UTF-8");
+            String fileName = URLEncoder.encode("融合原始数据统计", "UTF-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("融合原始数据")
+            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("融合原始数据统计")
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            System.out.println("导出融合原始数据excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出融合原始数据统计excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -1200,16 +1200,16 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             }
         });
         try {
-            System.out.println("导出北斗原始数据");
+            System.out.println("导出北斗原始数据统计");
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("utf-8");
-            String fileName = URLEncoder.encode("北斗原始数据", "UTF-8");
+            String fileName = URLEncoder.encode("北斗原始数据统计", "UTF-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("北斗原始数据")
+            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("北斗原始数据统计")
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response
-            System.out.println("导出北斗原始数据excel失败：{}" + e.getMessage() + e);
+            System.out.println("导出北斗原始数据统计excel失败：{}" + e.getMessage() + e);
         }
     }
 
@@ -1261,12 +1261,150 @@ public class FusionAnalysisServiceImpl implements FusionAnalysisService {
             }
         });
         try {
+            System.out.println("导出天奥原始数据统计");
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            String fileName = URLEncoder.encode("天奥原始数据统计", "UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
+            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("天奥原始数据统计")
+                    .doWrite(list);
+        } catch (Exception e) {
+            // 重置response
+            System.out.println("导出天奥原始数据统计excel失败：{}" + e.getMessage() + e);
+        }
+    }
+
+    @Override
+    public void fusionAnalysisExcelOriginalFour(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        List<FuseOriginal> list = new CopyOnWriteArrayList<>();
+        Date startTime = DateUtils.parse(query.getStartTime(),"yyyy-MM-dd");
+        String time = DateUtils.format(startTime,"yyyy-MM-dd");
+        SearchRequest request = new SearchRequest(INDEX_SEAT_FK_REALTIMETRAJECTORY_TEST);
+        // 构建查询条件
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        boolQueryBuilder.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        double[] doubles = new double[]{109.05069874931793,19.75955316191097,109.20963772383247,19.811999020000147,109.35696654655628,19.782373115430687,109.33374624297481,19.66386949715284,109.09473725611036,19.617428889989903,109.05069874931793,19.75955316191097};
+        List<GeoPoint> points = new ArrayList<>();
+        for(int i = 0 ;i < doubles.length;i=i+2) {
+            points.add(new GeoPoint(doubles[i+1],doubles[i]));
+        }
+        boolQueryBuilder.filter(QueryBuilders.geoPolygonQuery("location", points));
+        searchSourceBuilder.query(boolQueryBuilder);
+        searchSourceBuilder
+                .trackTotalHits(true)
+                .sort(SortBuilders.fieldSort("mergeTime").order(SortOrder.ASC))
+                .size(query.getPageSize())
+                .timeout(TimeValue.timeValueHours(1L))
+                .timeout(TimeValue.timeValueMinutes(30L))
+                .timeout(TimeValue.timeValueSeconds(500L));
+        request.source(searchSourceBuilder);
+        SearchResponse search = client.search(request, COMMON_OPTIONS);
+        SearchHits searchHits = search.getHits();
+        SearchHit[] hits = searchHits.getHits();
+        for (SearchHit hit : hits) {
+            FuseOriginal fuseOriginal = JSONObject.parseObject(hit.getSourceAsString(), FuseOriginal.class);
+            list.add(fuseOriginal);
+        }
+        try {
+            System.out.println("导出融合原始数据");
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            String fileName = URLEncoder.encode("融合原始数据", "UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
+            EasyExcel.write(response.getOutputStream(), FuseOriginal.class).sheet("融合原始数据")
+                    .doWrite(list);
+        } catch (Exception e) {
+            // 重置response
+            System.out.println("导出融合原始数据excel失败：{}" + e.getMessage() + e);
+        }
+    }
+
+    @Override
+    public void fusionAnalysisExcelOriginalFive(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        List<BeiDouOriginal> list = new CopyOnWriteArrayList<>();
+        Date startTime = DateUtils.parse(query.getStartTime(),"yyyy-MM-dd");
+        String time = DateUtils.format(startTime,"yyyy-MM-dd");
+        SearchRequest request = new SearchRequest(INDEX_SEAT_TRACK_BEIDOU+time);
+        // 构建查询条件
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        boolQueryBuilder.filter(QueryBuilders.rangeQuery("locationTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        double[] doubles = new double[]{109.05069874931793,19.75955316191097,109.20963772383247,19.811999020000147,109.35696654655628,19.782373115430687,109.33374624297481,19.66386949715284,109.09473725611036,19.617428889989903,109.05069874931793,19.75955316191097};
+        List<GeoPoint> points = new ArrayList<>();
+        for(int i = 0 ;i < doubles.length;i=i+2) {
+            points.add(new GeoPoint(doubles[i+1],doubles[i]));
+        }
+        boolQueryBuilder.filter(QueryBuilders.geoPolygonQuery("location", points));
+        searchSourceBuilder.query(boolQueryBuilder);
+        searchSourceBuilder
+                .trackTotalHits(true)
+                .size(query.getPageSize())
+                .sort(SortBuilders.fieldSort("locationTime").order(SortOrder.ASC))
+                .timeout(TimeValue.timeValueHours(1L))
+                .timeout(TimeValue.timeValueMinutes(30L))
+                .timeout(TimeValue.timeValueSeconds(500L));
+        request.source(searchSourceBuilder);
+        SearchResponse search = client.search(request, COMMON_OPTIONS);
+        SearchHits searchHits = search.getHits();
+        SearchHit[] hits = searchHits.getHits();
+        for (SearchHit hit : hits) {
+            BeiDouOriginal beiDouOriginal = JSONObject.parseObject(hit.getSourceAsString(), BeiDouOriginal.class);
+            list.add(beiDouOriginal);
+        }
+        try {
+            System.out.println("导出北斗原始数据");
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+            String fileName = URLEncoder.encode("北斗原始数据", "UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
+            EasyExcel.write(response.getOutputStream(), BeiDouOriginal.class).sheet("北斗原始数据")
+                    .doWrite(list);
+        } catch (Exception e) {
+            // 重置response
+            System.out.println("导出北斗原始数据excel失败：{}" + e.getMessage() + e);
+        }
+    }
+
+    @Override
+    public void fusionAnalysisExcelOriginalSix(FusionQuery query, HttpServletResponse response) throws IOException, ParseException {
+        List<TianAoOriginal> list = new CopyOnWriteArrayList<>();
+        Date startTime = DateUtils.parse(query.getStartTime(),"yyyy-MM-dd");
+        String time = DateUtils.format(startTime,"yyyy-MM-dd");
+        SearchRequest request = new SearchRequest(INDEX_SEAT_TRACK_RADAR+time);
+        // 构建查询条件
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        boolQueryBuilder.filter(QueryBuilders.rangeQuery("receiveTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        double[] doubles = new double[]{109.05069874931793,19.75955316191097,109.20963772383247,19.811999020000147,109.35696654655628,19.782373115430687,109.33374624297481,19.66386949715284,109.09473725611036,19.617428889989903,109.05069874931793,19.75955316191097};
+        List<GeoPoint> points = new ArrayList<>();
+        for(int i = 0 ;i < doubles.length;i=i+2) {
+            points.add(new GeoPoint(doubles[i+1],doubles[i]));
+        }
+        boolQueryBuilder.filter(QueryBuilders.geoPolygonQuery("location", points));
+        searchSourceBuilder.query(boolQueryBuilder);
+        searchSourceBuilder
+                .trackTotalHits(true)
+                .size(query.getPageSize())
+                .sort(SortBuilders.fieldSort("receiveTime").order(SortOrder.ASC))
+                .timeout(TimeValue.timeValueHours(1L))
+                .timeout(TimeValue.timeValueMinutes(30L))
+                .timeout(TimeValue.timeValueSeconds(500L));
+        request.source(searchSourceBuilder);
+        SearchResponse search = client.search(request, COMMON_OPTIONS);
+        SearchHits searchHits = search.getHits();
+        SearchHit[] hits = searchHits.getHits();
+        for (SearchHit hit : hits) {
+            TianAoOriginal tianAoOriginal = JSONObject.parseObject(hit.getSourceAsString(), TianAoOriginal.class);
+            list.add(tianAoOriginal);
+        }
+        try {
             System.out.println("导出天奥原始数据");
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
             response.setCharacterEncoding("utf-8");
             String fileName = URLEncoder.encode("天奥原始数据", "UTF-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), OriginalData.class).sheet("天奥原始数据")
+            EasyExcel.write(response.getOutputStream(), TianAoOriginal.class).sheet("天奥原始数据")
                     .doWrite(list);
         } catch (Exception e) {
             // 重置response