机场实体类更新

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 警情接警记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_alert_called")
+@ApiModel(value="AlertCalledDto", description="警情接警记录")
+public class AlertCalledDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情来源 人工：人工上报，对讲呼入，系统默认空")
+    private Boolean 
+alertSource;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_experts")
+@ApiModel(value="FireExpertsDto", description="")
+public class FireExpertsDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "证件类型")
+    private String documentType;
+
+    @ApiModelProperty(value = "证件号")
+    private Long documentNum;
+
+    @ApiModelProperty(value = "单位")
+    private String unitsName;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "名族")
+    private String national;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String theLatter;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalLandscape;
+
+    @ApiModelProperty(value = "学历")
+    private String educationBackground;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
+
+    @ApiModelProperty(value = "领域")
+    private String field;
+
+    @ApiModelProperty(value = "是否内部专家")
+    private Boolean isnoInternal;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "公用 电话")
+    private String officePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人员")
+    private String operationUesr;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+}

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队伍
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * l联系人
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员合同
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队员
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -73,6 +73,12 @@ public class FirefightersDto extends BaseEntity {
     @ApiModelProperty(value = "机场住宿情况")
     private String airportAccommodation;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 人员学历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防人员配装记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 岗位信息
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -37,9 +37,6 @@ public class FirefightersPostDto extends BaseEntity {
     @ApiModelProperty(value = "行政职务")
     private String administrativePosition;
 
-    @ApiModelProperty(value = "岗位名称")
-    private String jobTitle;
-
     @ApiModelProperty(value = "岗位资质")
     private String postQualification;
 

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员思想谈话记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 工作经历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 警情接警记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_alert_called")
+@ApiModel(value="AlertCalled对象", description="警情接警记录")
+public class AlertCalled extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情来源 人工：人工上报，对讲呼入，系统默认空")
+    private Boolean 
+alertSource;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_experts")
+@ApiModel(value="FireExperts对象", description="")
+public class FireExperts extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "证件类型")
+    private String documentType;
+
+    @ApiModelProperty(value = "证件号")
+    private Long documentNum;
+
+    @ApiModelProperty(value = "单位")
+    private String unitsName;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "名族")
+    private String national;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String theLatter;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalLandscape;
+
+    @ApiModelProperty(value = "学历")
+    private String educationBackground;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
+
+    @ApiModelProperty(value = "领域")
+    private String field;
+
+    @ApiModelProperty(value = "是否内部专家")
+    private Boolean isnoInternal;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "公用 电话")
+    private String officePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人员")
+    private String operationUesr;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+}

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队伍
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队员
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -74,6 +74,12 @@ public class Firefighters extends BaseEntity {
     @ApiModelProperty(value = "机场住宿情况")
     private String airportAccommodation;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * l联系人
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员合同
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 人员学历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防人员配装记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 岗位信息
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -38,9 +38,6 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "行政职务")
     private String administrativePosition;
 
-    @ApiModelProperty(value = "岗位名称")
-    private String jobTitle;
-
     @ApiModelProperty(value = "岗位资质")
     private String postQualification;
 

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员思想谈话记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 工作经历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @EqualsAndHashCode(callSuper = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* 警情接警记录 Mapper 接口
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireExpertsMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  Mapper 接口
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface FireExpertsMapper extends BaseMapper<FireExperts> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FireTeamMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 消防队伍 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FireTeamMapper extends BaseMapper<FireTeam> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContactsMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * l联系人 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersContactsMapper extends BaseMapper<FirefightersContacts> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersContractMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 消防员合同 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersContractMapper extends BaseMapper<FirefightersContract> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersEducationMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 人员学历 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersEducationMapper extends BaseMapper<FirefightersEducation> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersJacketMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 消防人员配装记录 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersJacketMapper extends BaseMapper<FirefightersJacket> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 消防队员 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersMapper extends BaseMapper<Firefighters> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersPostMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 岗位信息 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersPostMapper extends BaseMapper<FirefightersPost> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersThoughtMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 消防员思想谈话记录 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersThoughtMapper extends BaseMapper<FirefightersThought> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/FirefightersWorkexperienceMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * 工作经历 Mapper 接口
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface FirefightersWorkexperienceMapper extends BaseMapper<FirefightersWorkexperience> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertCalledService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* 警情接警记录 服务类
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface IAlertCalledService extends IService<AlertCalled> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireExpertsService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+*  服务类
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface IFireExpertsService extends IService<FireExperts> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireTeamService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 消防队伍 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFireTeamService extends IService<FireTeam> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersContactsService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * l联系人 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersContactsService extends IService<FirefightersContacts> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersContractService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 消防员合同 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersContractService extends IService<FirefightersContract> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersEducationService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 人员学历 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersEducationService extends IService<FirefightersEducation> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersJacketService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 消防人员配装记录 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersJacketService extends IService<FirefightersJacket> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersPostService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 岗位信息 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersPostService extends IService<FirefightersPost> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 消防队员 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersService extends IService<Firefighters> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersThoughtService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 消防员思想谈话记录 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersThoughtService extends IService<FirefightersThought> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersWorkexperienceService.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * 工作经历 服务类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 public interface IFirefightersWorkexperienceService extends IService<FirefightersWorkexperience> {
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertCalledVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 警情接警记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@Accessors(chain = true)
+@TableName("jc_alert_called")
+@ApiModel(value="AlertCalledVo", description="警情接警记录")
+public class AlertCalledVo{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "警情来源 人工：人工上报，对讲呼入，系统默认空")
+    private Boolean alertSource;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactUser;
+
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireExpertsVo.java

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+/**
+* 
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@Accessors(chain = true)
+@TableName("cb_fire_experts")
+@ApiModel(value="FireExpertsVo", description="")
+public class FireExpertsVo{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "证件类型")
+    private String documentType;
+
+    @ApiModelProperty(value = "证件号")
+    private Long documentNum;
+
+    @ApiModelProperty(value = "单位")
+    private String unitsName;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "名族")
+    private String national;
+
+    @ApiModelProperty(value = "籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty(value = "现居住地")
+    private String theLatter;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalLandscape;
+
+    @ApiModelProperty(value = "学历")
+    private String educationBackground;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobs;
+
+    @ApiModelProperty(value = "领域")
+    private String field;
+
+    @ApiModelProperty(value = "是否内部专家")
+    private Boolean isnoInternal;
+
+    @ApiModelProperty(value = "消防机构id")
+    private Long fireTeamId;
+
+    @ApiModelProperty(value = "公用 电话")
+    private String officePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人员")
+    private String operationUesr;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "备注")
+    private String note;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireTeamVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队伍
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersContactsVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * l联系人
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersContractVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员合同
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersEducationVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 人员学历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersJacketVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防人员配装记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersPostVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 岗位信息
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)
@@ -37,9 +37,6 @@ public class FirefightersPostVo{
     @ApiModelProperty(value = "行政职务")
     private String administrativePosition;
 
-    @ApiModelProperty(value = "岗位名称")
-    private String jobTitle;
-
     @ApiModelProperty(value = "岗位资质")
     private String postQualification;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersThoughtVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防员思想谈话记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 消防队员
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)
@@ -73,6 +73,12 @@ public class FirefightersVo{
     @ApiModelProperty(value = "机场住宿情况")
     private String airportAccommodation;
 
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "人员状态，在职/离职")
+    private String state;
+
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersWorkexperienceVo.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * 工作经历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Data
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/FireExpertsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import java.util.Arrays;
+
+
+/**
+* 警情接警记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "警情接警记录Api")
+@RequestMapping(value = "/jcs/alert-called")
+public class AlertCalledController extends BaseController {
+
+    @Autowired
+    IAlertCalledService iAlertCalledService;
+
+    /**
+    * 新增警情接警记录
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增警情接警记录", notes = "新增警情接警记录")
+    public boolean saveAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled){
+        return iAlertCalledService.save(alertCalled);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iAlertCalledService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改警情接警记录
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改警情接警记录", notes = "修改警情接警记录")
+    public boolean updateByIdAlertCalled(HttpServletRequest request, @RequestBody AlertCalled alertCalled){
+        return iAlertCalledService.updateById(alertCalled);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public AlertCalled selectById(HttpServletRequest request, @PathVariable Long id){
+        return iAlertCalledService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<AlertCalled> listPage(String pageNum,String pageSize, AlertCalled alertCalled){
+
+        Page<AlertCalled> pageBean;
+        QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
+        Class<? extends AlertCalled> aClass = alertCalled.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(alertCalled);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(alertCalled);
+                        alertCalledQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(alertCalled);
+                        alertCalledQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(alertCalled);
+                        alertCalledQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(alertCalled);
+                        alertCalledQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<AlertCalled> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireExpertsController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import java.util.Arrays;
+
+
+/**
+* 
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jcs/fire-experts")
+public class FireExpertsController extends BaseController {
+
+    @Autowired
+    IFireExpertsService iFireExpertsService;
+
+    /**
+    * 新增
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public boolean saveFireExperts(HttpServletRequest request, @RequestBody FireExperts fireExperts){
+        return iFireExpertsService.save(fireExperts);
+    }
+
+    /**
+    * 根据id删除
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
+    public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
+        return iFireExpertsService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改", notes = "修改")
+    public boolean updateByIdFireExperts(HttpServletRequest request, @RequestBody FireExperts fireExperts){
+        return iFireExpertsService.updateById(fireExperts);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public FireExperts selectById(HttpServletRequest request, @PathVariable Long id){
+        return iFireExpertsService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<FireExperts> listPage(String pageNum,String pageSize, FireExperts fireExperts){
+
+        Page<FireExperts> pageBean;
+        QueryWrapper<FireExperts> fireExpertsQueryWrapper = new QueryWrapper<>();
+        Class<? extends FireExperts> aClass = fireExperts.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(fireExperts);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(fireExperts);
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(fireExperts);
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(fireExperts);
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(fireExperts);
+                        fireExpertsQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<FireExperts> page;
+        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
+            pageBean = new Page<>(0, Long.MAX_VALUE);
+        } else {
+            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        }
+        page = iFireExpertsService.page(pageBean, fireExpertsQueryWrapper);
+            return page;
+        }
+    }
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 消防队伍
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "消防队伍Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContactsController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * l联系人
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "l联系人Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersContractController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 消防员合同
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "消防员合同Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -18,6 +18,8 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.exception.BaseException;
+
 import java.util.Arrays;
 
 
@@ -25,7 +27,7 @@ import java.util.Arrays;
 * 消防队员
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "消防队员Api")
@@ -92,12 +94,11 @@ public class FirefightersController extends BaseController {
     * 列表分页查询
     * @return
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<Firefighters> listPage(String pageNum,String pageSize, Firefighters firefighters){
-
-        Page<Firefighters> pageBean;
+       Page<Firefighters> pageBean;
         QueryWrapper<Firefighters> firefightersQueryWrapper = new QueryWrapper<>();
         Class<? extends Firefighters> aClass = firefighters.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersEducationController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 人员学历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "人员学历Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersJacketController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 消防人员配装记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "消防人员配装记录Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersPostController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 岗位信息
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "岗位信息Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersThoughtController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 消防员思想谈话记录
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "消防员思想谈话记录Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersWorkexperienceController.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 * 工作经历
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @RestController
 @Api(tags = "工作经历Api")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+* 警情接警记录 服务实现类
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Service
+public class AlertCalledServiceImpl extends ServiceImpl<AlertCalledMapper, AlertCalled> implements IAlertCalledService {
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireExpertsServiceImpl.java

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+*  服务实现类
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Service
+public class FireExpertsServiceImpl extends ServiceImpl<FireExpertsMapper, FireExperts> implements IFireExpertsService {
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 消防队伍 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FireTeamServiceImpl extends ServiceImpl<FireTeamMapper, FireTeam> implements IFireTeamService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContactsServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * l联系人 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersContactsServiceImpl extends ServiceImpl<FirefightersContactsMapper, FirefightersContacts> implements IFirefightersContactsService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersContractServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 消防员合同 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersContractServiceImpl extends ServiceImpl<FirefightersContractMapper, FirefightersContract> implements IFirefightersContractService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersEducationServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 人员学历 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersEducationServiceImpl extends ServiceImpl<FirefightersEducationMapper, FirefightersEducation> implements IFirefightersEducationService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersJacketServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 消防人员配装记录 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersJacketServiceImpl extends ServiceImpl<FirefightersJacketMapper, FirefightersJacket> implements IFirefightersJacketService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersPostServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 岗位信息 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersPostServiceImpl extends ServiceImpl<FirefightersPostMapper, FirefightersPost> implements IFirefightersPostService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 消防队员 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersServiceImpl extends ServiceImpl<FirefightersMapper, Firefighters> implements IFirefightersService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersThoughtServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 消防员思想谈话记录 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersThoughtServiceImpl extends ServiceImpl<FirefightersThoughtMapper, FirefightersThought> implements IFirefightersThoughtService {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersWorkexperienceServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 * 工作经历 服务实现类
 *
 * @author tb
-* @date 2021-06-04
+* @date 2021-06-07
 */
 @Service
 public class FirefightersWorkexperienceServiceImpl extends ServiceImpl<FirefightersWorkexperienceMapper, FirefightersWorkexperience> implements IFirefightersWorkexperienceService {