机场实体类更新

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/controller/UserController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RemoteSecurityService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * 获取用户信息
+ *
+ * @author gaodongdong
+ */
+@RestController
+@RequestMapping(value = "/api/user")
+@Api(tags = "用户信息api")
+public class UserController extends BaseController {
+
+	private final Logger logger = LoggerFactory.getLogger(UserController.class);
+
+	@Autowired
+	private RemoteSecurityService remoteSecurityService;		
+	@Autowired
+	private RestTemplate restTemplate;
+	
+	@Value("${security.systemctl.name}")
+	private String systemctl;
+	private static final String appType = "APP";
+	
+	/**
+	 * 获取公司选择信息
+	 */
+	@ApiOperation(value = "获取公司选择信息", notes = "获取公司选择信息")
+	@GetMapping(value = "/selectInfo")
+	public JSONObject selectInfo() {
+		try {
+			JSONObject result = new JSONObject();
+			AgencyUserModel user = getUserInfo();
+			if (user != null) {
+				List<CompanyModel> list = user.getCompanys();
+				Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
+				Map<String, List<Map<String, Object>>> mapdate = new HashMap<String, List<Map<String, Object>>>();
+				List<Map> listCompanyModel = new ArrayList();
+				if (list != null && list.size() > 0) {
+					for (CompanyModel article : list) {
+						Map<String, Object> map = objectToMap(article);
+						map.put("companySeq", map.get("sequenceNbr") + "");
+						map.put("parentId", map.get("parentId") + "");
+						listCompanyModel.add(map);
+						long key = Long.valueOf(map.get("sequenceNbr").toString());
+						List<DepartmentModel> listdep = mapDepartments.get(key);
+						List<Map<String, Object>> dep = new ArrayList();
+						for (DepartmentModel departmentModel : listdep) {
+							if (departmentModel != null) {
+								Map<String, Object> mapo = objectToMap(departmentModel);
+								mapo.put("sequenceNbr", mapo.get("sequenceNbr").toString());
+								dep.add(mapo);
+							}
+						}
+						mapdate.put(map.get("sequenceNbr").toString(), dep);
+					}
+				}
+				Map<String, Object> mapRoles = objectToMap(user.getOrgRoles());
+
+				result.put("companys", listCompanyModel);
+				result.put("orgRoles", user.getOrgRoles());
+				result.put("companyDepartments", mapdate);
+				return result;
+			} else {
+				throw new RuntimeException("请重新登录");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("获取公司选择信息异常", e);
+			throw new RuntimeException(e.getMessage());
+		}
+	}
+
+	
+	// 对象转map
+
+	public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (obj != null) {
+			Class<?> clazz = obj.getClass();
+			for (Field field : clazz.getDeclaredFields()) {
+				field.setAccessible(true);
+				String fieldName = field.getName();
+				Object value = nvl(field.get(obj));
+
+				if (fieldName.equals("sequenceNbr")) {
+					map.put(fieldName, value + "");
+				} else if (fieldName.equals("companySeq")) {
+					map.put(fieldName, value + "");
+				} else if (fieldName.equals("children")) {
+					map.put(fieldName, value);
+				} else {
+					map.put(fieldName, value);
+				}
+
+			}
+			return map;
+		}
+		return map;
+	}
+
+	public static Object nvl(Object param) {
+		return param != null ? param : "";
+	}
+
+	/**
+	 * 保存登陆用户选择公司信息
+	 */
+	@ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
+	@PostMapping(value = "/save/curCompany")
+	public JSONObject saveCurCompany(
+			@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody ReginParams selectUserInfo) {
+		try {
+			AgencyUserModel user = getUserInfo();
+			CompanyBo company = new CompanyBo();
+			DepartmentBo department = new DepartmentBo();
+			RoleBo role = new RoleBo();
+			if(ObjectUtils.isEmpty(selectUserInfo.getCompany())){
+				CompanyModel companyM = user.getCompanys().get(0);
+				Bean.copyExistPropertis(companyM,company);
+				
+				Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
+				DepartmentModel departmentM = mapDepartments.get(companyM.getSequenceNbr()).get(0);
+				Bean.copyExistPropertis(departmentM,department);
+				Map<Long, List<RoleModel>> roles = user.getOrgRoles();
+				RoleModel roleM = roles.get(departmentM.getSequenceNbr()).get(0);
+				
+				Bean.copyExistPropertis(roleM,role);
+				selectUserInfo.setCompany(company);
+				selectUserInfo.setDepartment(department);
+				selectUserInfo.setRole(role);
+			}else{
+				company = selectUserInfo.getCompany();
+				role = selectUserInfo.getRole();
+				department = selectUserInfo.getDepartment();
+			}
+			ReginParams reginParams = new ReginParams();
+			reginParams.setCompany(company);
+			reginParams.setRole(role);
+			reginParams.setDepartment(department);
+			saveSelectedOrgInfo(reginParams);
+		
+			return buildCurCompany(selectUserInfo, user);
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("保存登陆用户选择公司信息异常", e);
+			throw new RuntimeException("系统繁忙，请稍后再试");
+		}
+	}
+
+	private JSONObject buildCurCompany(ReginParams selectUserInfo, AgencyUserModel user) {
+		JSONObject result = new JSONObject();
+		result.put("userId", user.getUserId());
+		result.put("realName", user.getRealName());
+		result.put("userMobile", user.getMobile());
+		result.put("userName", user.getUserName());
+		result.put("email", user.getEmail());
+
+		ResponseModel secResponse = remoteSecurityService
+				.searchPermissionTree(selectUserInfo.getRole().getSequenceNbr(), appType);
+		List<JSONObject> listp = new ArrayList<>();
+		if (secResponse.getStatus()==HttpStatus.OK.value() && secResponse.getResult() != null) {
+			JSONArray arr = JSON.parseArray(JSONArray.toJSONString(secResponse.getResult()));
+			Map<String, JSONObject> map = Maps.newHashMap();
+
+			if (arr != null && arr.size() > 0) {
+				JSONObject obj = arr.getJSONObject(0);
+				if (obj != null) {
+					JSONArray childrens = obj.getJSONArray("children");
+					if (childrens != null && childrens.size() > 0) {
+						for (int i = 0; i < childrens.size(); i++) {
+							JSONObject child = childrens.getJSONObject(i);
+							// map.put(child.getString("path"), child);
+							listp.add(child);
+						}
+					}
+				}
+
+				// result.put("userPower", map.get("app"));
+			}
+		}
+		result.put("userPower", JSON.toJSON(listp));
+		result.put("companyModel", selectUserInfo.getCompany());
+		result.put("departmentModel", selectUserInfo.getDepartment());
+		result.put("roleModel", selectUserInfo.getRole());
+		return result;
+	}
+
+	
+
+	/**
+	 * 
+	 * 获取字典
+	 * 
+	 */
+
+	@ApiOperation(value = "查询指定的字典信息", notes = "查询指定的字典信息")
+	@GetMapping(value = "listDictionaryByDictCode/{dictCode}")
+	public List<DictionarieValueModel> listDictionaryByDictCode(@PathVariable String dictCode) {
+		try {
+			List<DictionarieValueModel> list = remoteSecurityService.listDictionaryByDictCode(dictCode);
+
+			return list;
+		} catch (Exception e) {
+
+			throw new RuntimeException();
+		}
+	}
+
+	/**
+	 * 
+	 * 
+	 * 上传图片到平台
+	 * 
+	 **/
+	@ApiOperation(httpMethod = "POST", value = "文件上传(<font color='blue'>release</font>)", notes = "文件上传")
+	@RequestMapping(value = "/upload-file", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+	public ResponseModel uploadFile(@RequestParam("file") MultipartFile file) {
+
+		FeignClientResult<Map<String, String>> date = remoteSecurityService.fileImage(file);
+		Map<String, String> map1 = new HashMap<>();
+		if (date != null) {
+			Map<String, String> map = date.getResult();
+			Iterator<String> it = map.keySet().iterator();
+
+			while (it.hasNext()) {
+				map1.put("url", it.next());
+			}
+
+		}
+		return CommonResponseUtil.success(map1);
+	}
+
+	@ApiOperation(httpMethod = "POST", value = "文件上传(<font color='blue'>release</font>)", notes = "文件上传")
+	@RequestMapping(value = "/upload-files", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+	public ResponseModel uploadFile(@RequestParam("files") MultipartFile[] files) throws IOException {
+
+		// 设置请求头
+		HttpHeaders headers = new HttpHeaders();
+		MediaType type = MediaType.parseMediaType("multipart/form-data");
+		headers.setContentType(type);
+		headers.set("product", getProduct());
+		headers.set("token", getToken());
+		headers.set("appKey", getAppKey());
+		// 设置请求体，注意是LinkedMultiValueMap
+		MultiValueMap<String, Object> form = new LinkedMultiValueMap<>();
+		List<Object> fileList = new ArrayList<>();
+		for (MultipartFile file : files) {
+			ByteArrayResource byteArrayResource = new ByteArrayResource(file.getBytes()) {
+				@Override
+				public String getFilename() throws IllegalStateException {
+					return file.getOriginalFilename();
+				}
+			};
+			fileList.add(byteArrayResource);
+		}
+
+		form.put("files", fileList);
+
+		// 用HttpEntity封装整个请求报文
+		HttpEntity<MultiValueMap<String, Object>> files1 = new HttpEntity<>(form, headers);
+
+		ResponseEntity<String> responseEntity = restTemplate.exchange(
+				"http://" + systemctl + "/systemctl/v1/filestorage/image", HttpMethod.POST, files1, String.class);
+
+		JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
+
+		Map<String, String> map1 = new HashMap<>();
+		if (jsonObject != null) {
+			Map<String, String> map = JSON.parseObject(jsonObject.get("result").toString(), Map.class);
+			Iterator<String> it = map.keySet().iterator();
+			String url = "";
+			while (it.hasNext()) {
+				url = url + it.next() + ",";
+			}
+			map1.put("url", url);
+		}
+		return CommonResponseUtil.success(map1);
+	}
+
+}
\ No newline at end of file

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 {

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

+package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.client.AgencyUserClient;
+import com.yeejoin.amos.feign.privilege.model.*;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/***
+ *
+ * 平台安全接口实现类
+ *
+ * ***/
+@Service("remoteSecurityService")
+public class RemoteSecurityService {
+
+    @Value("${security.productApp}")
+    private String productApp;
+    @Value("${security.appKeyApp}")
+    private String appKeyApp;
+    @Autowired
+    private HttpServletRequest request;
+
+    // * 根据公司id查询机构用户
+
+    public List<AgencyUserModel> listUserByCompanyId(String companyId) {
+        if (StringUtils.isEmpty(companyId)) {
+            return null;
+        }
+        List<AgencyUserModel> AgencyUserModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.agencyUserClient.queryByCompanyId(Long.valueOf(companyId), null);
+            AgencyUserModel = (List<AgencyUserModel>) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return AgencyUserModel;
+    }
+
+    /**
+     * 用户id批量获取用户信息
+     *
+     * @param userIds 用户ids
+     * @return List<AgencyUserModel>
+     */
+    public List<AgencyUserModel> listUserByUserIds(String userIds) {
+        List<AgencyUserModel> agencyUserModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.agencyUserClient.queryByIds(userIds);
+            agencyUserModel = (List<AgencyUserModel>) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return agencyUserModel;
+    }
+
+    /**
+     * 用户id获取用户信息
+     *
+     * @param userId 用户编号
+     * @return AgencyUserModel
+     */
+    public AgencyUserModel getUserById(String userId) {
+        if (StringUtils.isEmpty(userId)) {
+            return null;
+        }
+        AgencyUserModel agencyUserModel;
+        try {
+            agencyUserModel = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByUserId(userId));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return agencyUserModel;
+    }
+
+    // 根据orgCode查询机构用户
+    public List<AgencyUserModel> listUserByOrgCode(String orgCode) {
+        if (StringUtils.isEmpty(orgCode)) {
+            return null;
+        }
+        Set<AgencyUserModel> agencyUserModel;
+        try {
+            agencyUserModel = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(orgCode));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return new ArrayList<>(agencyUserModel);
+    }
+
+    // 根据部门id查询机构用户
+    public List<AgencyUserModel> listUserByDepartmentId(Long departmentId) {
+        if (departmentId == null) {
+            return null;
+        }
+        List<AgencyUserModel> agencyUserModel;
+        try {
+            agencyUserModel = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByDepartmentId(departmentId, null));
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return agencyUserModel;
+    }
+
+    // 根据orgCode查询机构
+    public Map<String, Object> listByOrgCode(String orgCode) {
+        if (StringUtils.isEmpty(orgCode)) {
+            return null;
+        }
+        Map<String, Object> agencyUserModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.companyClient.queryByOrgcode(orgCode);
+            agencyUserModel = (Map<String, Object>) feignClientResult.getResult();
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return agencyUserModel;
+    }
+
+    // 查询指定公司的部门树
+    public List<DepartmentModel> getDepartmentTreeByCompanyId(Long companyId) {
+        if (companyId == null) {
+            return null;
+        }
+        List<DepartmentModel> departmentModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.departmentClient.queryDeptTree(null, companyId);
+            departmentModel = (List<DepartmentModel>) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+        return departmentModel;
+
+    }
+
+
+    /**
+     * 基础平台全部菜单权限树,用于平台登录前端初始化路由
+     */
+    public ResponseModel searchPermissionTree(long id, String appType) {
+        List<PermissionModel> dictionarieModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.permissionClient.treeByRole(id, appType, null, null);
+            dictionarieModel = (List<PermissionModel>) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            throw new RuntimeException();
+        }
+        ResponseModel commonResponse = CommonResponseUtil.success( dictionarieModel);
+        return commonResponse;
+    }
+
+    /**
+     * 根据Code查询指定的字典信息
+     *
+     * @param dictCode 字典编号
+     * @return List<DictionarieValueModel>
+     */
+    public List<DictionarieValueModel> listDictionaryByDictCode(String dictCode) {
+        List<DictionarieValueModel> dictionarieModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Systemctl.dictionarieClient.dictValues(dictCode);
+            dictionarieModel = (List<DictionarieValueModel>) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            throw new RuntimeException();
+        }
+
+        return dictionarieModel;
+    }
+
+    /**
+     * 查询指定公司信息与其部门用户树
+     */
+    public CompanyModel listUserByCompanyId1(Long companyId) {
+        if (companyId == null) {
+            return null;
+        }
+        CompanyModel companyModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.companyClient.withDeptAndUsers(companyId);
+            companyModel = (CompanyModel) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            throw new RuntimeException();
+        }
+        return companyModel;
+
+    }
+
+    public JSONObject loginFromApp(String userName, String password) throws InnerInvokException {
+        IdPasswordAuthModel dPasswordAuthModel = new IdPasswordAuthModel();
+        dPasswordAuthModel.setLoginId(userName);
+        dPasswordAuthModel.setPassword(password);
+        Map map = null;
+        FeignClientResult feignClientResult = new FeignClientResult();
+        RequestContext.setProduct(productApp);
+        feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
+        map = (Map) feignClientResult.getResult();
+        map.put("appKey", appKeyApp);
+        map.put("product", productApp);
+        if (map != null) {
+            String jsonStr = JSON.toJSONString(map);
+            return JSONObject.parseObject(jsonStr);
+        }
+        return null;
+    }
+
+    public boolean loginOutFromApp(String toke, String product, String appKey) {
+
+        boolean flag = false;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.authClient.removeToken();
+            flag = true;
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+
+        return flag;
+    }
+
+    public JSONArray listDepartmentUserTree(Long companyId) {
+
+        CompanyModel companyModel = null;
+        FeignClientResult feignClientResult;
+        try {
+            feignClientResult = Privilege.companyClient.withDeptAndUsers(companyId);
+            companyModel = (CompanyModel) feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+
+        if (companyModel != null) {
+            String jsonStr = null;
+
+            jsonStr = JSON.toJSONString(companyModel.getChildren());
+
+            return JSONArray.parseArray(jsonStr);
+        }
+        return null;
+
+    }
+
+    public boolean editPassword(String userId, String oldPassword, String newPassword) throws InnerInvokException {
+        boolean flag = false;
+        AgencyUserModel agencyUserModel = new AgencyUserModel();
+        agencyUserModel.setPassword(newPassword);
+        agencyUserModel.setRePassword(newPassword);
+        agencyUserModel.setOriginalPassword(oldPassword);
+        AgencyUserModel agencyUserModel2 = null;
+        FeignClientResult feignClientResult;
+        feignClientResult = Privilege.agencyUserClient.modifyPassword(userId, agencyUserModel);
+        agencyUserModel = (AgencyUserModel) feignClientResult.getResult();
+        if (agencyUserModel2 != null) {
+            flag = true;
+        }
+        return false;
+    }
+
+    public FeignClientResult<Map<String, String>> fileImage(MultipartFile file) {
+        String product = request.getHeader("product");
+        String appKey = request.getHeader("appKey");
+        try {
+            RequestContext.setProduct(product);
+            RequestContext.setAppKey(appKey);
+            FeignClientResult<Map<String, String>> date = Systemctl.fileStorageClient.updateCommonFile(file);
+
+            return date;
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+
+    }
+
+    public FeignClientResult<Map<String, String>> fileImage(MultipartFile[] files) {
+
+        try {
+            FeignClientResult<java.util.Map<String, String>> date = Systemctl.fileStorageClient
+                    .updateCommonFiles(files);
+
+            return date;
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+            throw new RuntimeException();
+        }
+
+    }
+
+    public AgencyUserModel getAgencyUser() {
+        FeignClientResult<AgencyUserModel> agencyUser = null;
+        AgencyUserModel userModel = null;
+        try {
+            AgencyUserClient agencyUserClient = Privilege.agencyUserClient;
+            agencyUser = agencyUserClient.getme();
+            userModel = agencyUser.getResult();
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+        }
+        return userModel;
+    }
+}