调派规则

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCallePowerTransferRo.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.component.rule.Label;
+import com.yeejoin.amos.component.rule.RuleFact;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 
+ * <pre>
+ * 警情报送规则触发对象
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AlertCalledRo.java, v 0.1 2021年6月24日 下午3:31:14 gwb Exp $
+ */
+@Data
+@RuleFact(value = "警情信息",project = "西咸机场119调派规则")
+public class AlertCallePowerTransferRo implements Serializable{
+
+
+
+
+	/**
+	 * <pre>
+	 * 
+	 * </pre>
+	 */
+	private static final long serialVersionUID = 7091835997817930383L;
+
+	/**
+	 * 通用属性
+	 */
+	@Label("警情id")
+    private String sequenceNbr;
+	
+	@Label(value = "警情时间")
+    private String callTimeStr;
+   
+    @Label(value = "警情类型")
+    private String alertType;
+
+    @Label(value = "警情类型code")
+    private String alertTypeCode;
+    
+    @Label(value = "发送单位")
+    private String companyName;
+
+    @Label(value = "被困人数")
+    private String trappedNum;
+
+    @Label(value = "伤亡人数")
+    private String casualtiesNum;
+    
+    @Label(value = "地址")
+    private String address;
+
+    @Label(value = "警情报送id")
+    private String alertSubmittedId;
+    /**
+     * 一般火灾
+     */
+    @Label(value = "失火位置")
+    private String fireLocation;
+    
+    @Label(value = "燃烧物质")
+    private String burningMaterial;
+    
+    @Label(value = "火势情况")
+    private String fireSituation;
+    
+    @Label(value = "危险爆炸品")
+    private String dangerousExplosives;
+    /**
+     * 航空器救援
+     */
+    @ApiModelProperty(value = " 警情特有属性拼接")
+    private String content;
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+
+
+    @ApiModelProperty(value = " 调派单位id")
+    private Long powerCompanyId;
+
+    @ApiModelProperty(value = "调派单位名称")
+    private String powerCompanyName;
+
+
+    @ApiModelProperty(value = "调派单位资源列表")
+    private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
+
+    @ApiModelProperty(value = "调派类型队伍")
+    private String powerTransType;
+
+
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyDto.java

@@ -48,4 +48,8 @@ public class PowerTransferCompanyDto extends BaseDto {
     @ApiModelProperty(value = "调派单位资源列表")
     private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
 
+    @ApiModelProperty(value = "调派类型队伍")
+    private String powerTransType;
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireBrigadeTypeEnum.java

@@ -12,7 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FireBrigadeTypeEnum {
     专职消防队("fullTime", "116", "专职消防队"),
-    医疗救援队("monitorTeam", "830", "医疗救援队"),
+    医疗救援队("medicalTeam", "830", "医疗救援队"),
     监控大队("monitorTeam", "118", "监控大队");
 
     private String key;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2130,5 +2130,19 @@
         </sql>
     </changeSet>
 
- </databaseChangeLog>
+
+    <changeSet author="tw" id="2021-11-11-1">
+        <comment>update data jc_powerr_transfer_log</comment>
+        <sql>
+            ALTER TABLE jc_powerr_transfer_log ADD power_transfer_company_id bigint(30)  NULL COMMENT '调派关联部门id';
+            ALTER TABLE jc_powerr_transfer_log ADD power_transfer_company_resources_id bigint(30)  NULL COMMENT '调派关联资源id';
+        </sql>
+    </changeSet>
+
+
+
+
+
+
+</databaseChangeLog>