全返

songhua-system/src/main/java/com/songhua/system/domain/CruiseShipMapping.java

@@ -1,6 +1,7 @@
 package com.songhua.system.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.songhua.common.annotation.Excel;
 import com.songhua.common.core.domain.BaseEntity;
 import lombok.Data;
 
@@ -23,4 +24,36 @@ public  class CruiseShipMapping extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date shipTime;
     private String shipName;
+    /** 船型 */
+    @Excel(name = "船型")
+    private String shipType;
+
+    /** 船长 */
+    @Excel(name = "船长")
+    private String lengthOverall;
+
+
+    /** 船舶注册号 */
+    @Excel(name = "船舶注册号")
+    private String registrationNumber;
+
+    /** 船舱数量 */
+    @Excel(name = "船舱数量")
+    private String quantity;
+
+
+
+    /** 船舱数量 */
+    @Excel(name = "驱动类型")
+    private String propulsion;
+
+    /** 乘客容量 */
+    @Excel(name = "乘客容量")
+    private String passengerCapacity;
+
+
+
+    /** 乘客容量 */
+    @Excel(name = "安全设备")
+    private String safetyEquipment;
 }

songhua-system/src/main/java/com/songhua/system/service/impl/CruiseShipMappingServiceImpl.java

@@ -101,6 +101,13 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
             data.put("polylinePath",data1);
             data.put("color", color.get(i));
             data.put("shipName", recentLocations.get(i).getShipName());
+            data.put("shipType", recentLocations.get(i).getShipType());
+            data.put("lengthOverall", recentLocations.get(i).getLengthOverall());
+            data.put("registrationNumber", recentLocations.get(i).getRegistrationNumber());
+            data.put("quantity", recentLocations.get(i).getQuantity());
+            data.put("propulsion", recentLocations.get(i).getPropulsion());
+            data.put("passengerCapacity", recentLocations.get(i).getPassengerCapacity());
+            data.put("safetyEquipment", recentLocations.get(i).getSafetyEquipment());
             combinedData.add(data);
         }
         return combinedData;