增加接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertCalled对象", description="警情接警记录")
 public class AlertCalled extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
     @ApiModelProperty(value = "警情状态")
     private Boolean alertStatus;
@@ -44,12 +44,6 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "报警类型code")
     private String alarmTypeCode;
 
-    @ApiModelProperty(value = "报警方式")
-    private String alarmMode;
-
-    @ApiModelProperty(value = "报警方式code")
-    private String alarmModeCode;
-
     @ApiModelProperty(value = "通话记录信息id")
     private Integer callRecordId;
 
@@ -113,4 +107,8 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "接警时间结束---用于列表过滤")
     @TableField(exist=false)
     private Date callTimeEnd ;
+  
+    @TableField(exist=false)
+    @ApiModelProperty(value = "是否处警")
+    private Boolean isFatherAlert;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFrom.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertFrom对象", description="警情表单")
 public class AlertFrom extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "警情类型")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFromType.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertFromType对象", description="动态表单类型")
 public class AlertFromType extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "表单类型code")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFromValue.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertFromValue对象", description="")
 public class AlertFromValue extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
 
     @ApiModelProperty(value = "表单id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmitted.java

@@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertSubmitted对象", description="警情报送记录")
 public class AlertSubmitted extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "警情id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmittedObject.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="AlertSubmittedObject对象", description="报送对象")
 public class AlertSubmittedObject extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "报送单据id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/CbDemo.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @ApiModel(value = "tb_demo对象", description = "Demo示例")
 public class CbDemo extends BaseEntity {
 
-	private static final long serialVersionUID = 1L;
+	
 
 	@ApiModelProperty(value = "NAME")
 	private String name;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/DataDictionary.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="DataDictionary对象", description="数据字典")
 public class DataDictionary extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "code")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireExperts.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FireExperts对象", description="")
 public class FireExperts extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "姓名")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FireTeam.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FireTeam对象", description="消防队伍")
 public class FireTeam extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "消防队伍图片")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Firefighters.java

@@ -29,8 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="Firefighters对象", description="消防队员")
 public class Firefighters extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
+   
 
     @ApiModelProperty(value = "系统账号")
     private String systemAccount;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContacts.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersContacts对象", description="联系人")
 public class FirefightersContacts extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
 
     @ApiModelProperty(value = "人员id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersContract.java

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersContract对象", description="消防员合同")
 public class FirefightersContract extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
 
     @ApiModelProperty(value = "合同名称")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersEducation.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersEducation对象", description="人员学历")
 public class FirefightersEducation extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "人员id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersJacket.java

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersJacket对象", description="消防人员配装记录")
 public class FirefightersJacket extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "消防队员")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersPost.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersPost对象", description="岗位信息")
 public class FirefightersPost extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "人员id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersThought.java

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersThought对象", description="消防员思想谈话记录")
 public class FirefightersThought extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+  
 
 
     @ApiModelProperty(value = "消防救援人员")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/FirefightersWorkexperience.java

@@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="FirefightersWorkexperience对象", description="工作经历")
 public class FirefightersWorkexperience extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "参加工作时间")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsr.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="OrgUsr对象", description="机构/部门/人员表")
 public class OrgUsr extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
 
     @ApiModelProperty(value = "机构/部门名称")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsrAuth.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="OrgUsrAuth对象", description="")
 public class OrgUsrAuth extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     private String recUserName;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransfer.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="PowerTransfer对象", description="力量调派")
 public class PowerTransfer extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "警情id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompany.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="PowerTransferCompany对象", description="调派单位")
 public class PowerTransferCompany extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+    
 
 
     @ApiModelProperty(value = "调派单据id")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="PowerTransferCompanyResources对象", description="调派单位资源")
 public class PowerTransferCompanyResources extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "资源类型")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Template.java

@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @ApiModel(value="Template对象", description="模板表")
 public class Template extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+   
 
 
     @ApiModelProperty(value = "模板类型")