1.冗余字段

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentSignalLogDto.java

@@ -74,6 +74,9 @@ public class FireEquipmentSignalLogDto extends BaseDto {
     @ApiModelProperty(value = "装备所属消防系统code（冗余字段）")
     private String systemMrids;
 
+    @ApiModelProperty(value = "装备所属消防系统名称（冗余字段）")
+    private String systemNames;
+
     @ApiModelProperty(value = "装备定义code（冗余字段）")
     private String equipmentDefinitionMrid;
 
@@ -100,4 +103,16 @@ public class FireEquipmentSignalLogDto extends BaseDto {
 
     @ApiModelProperty(value = "是否为告警信号数据")
     private Boolean isAlarm;
+
+    @ApiModelProperty(value = "保护对象code")
+    private String protectedObjectMrid;
+
+    @ApiModelProperty(value = "保护对象名称")
+    private String protectedObjectName;
+
+    @ApiModelProperty(value = "换流站负责人")
+    private String stationChargePerson;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String chargePersonPhone;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireEquipmentSignalLog.java

@@ -130,6 +130,11 @@ public class FireEquipmentSignalLog extends BaseEntity {
     private String systemMrids;
 
     /**
+     * 装备所属消防系统名称（冗余字段）
+     */
+    private String systemNames;
+
+    /**
      * 装备定义code（冗余字段）
      */
     @TableField("equipment_definition_mrid")
@@ -169,4 +174,14 @@ public class FireEquipmentSignalLog extends BaseEntity {
      */
     private Boolean isAlarm;
 
+    /**
+     *保护对象code
+     */
+    private String protectedObjectMrid;
+
+    /**
+     *保护对象名称
+     */
+    private String protectedObjectName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalLogMapper.xml

@@ -25,7 +25,12 @@
             </choose>
             a.station_code,
             a.lat as sourceLat,
-            a.lng as sourceLng
+            a.lng as sourceLng,
+            a.protected_object_mrid,
+            a.protected_object_name,
+            a.system_names,
+            s.station_charge_person,
+            s.charge_person_phone
         from
             asf_fire_equipment_signal_log a,
             asf_fire_station_info s