基础信息

amos-boot-biz-common/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/DataDictionaryDto.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("cb_data_dictionary")
+@ApiModel(value="DataDictionaryDto", description="数据字典")
+public class DataDictionaryDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

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

+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("cb_data_dictionary")
+@ApiModel(value="DataDictionary对象", description="数据字典")
+public class DataDictionary extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-biz-common/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/DataDictionaryMapper.java

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

amos-boot-biz-common/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IDataDictionaryService.java

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

amos-boot-biz-common/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/DataDictionaryVo.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("cb_data_dictionary")
+@ApiModel(value="DataDictionaryVo", description="数据字典")
+public class DataDictionaryVo{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-biz-common/amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/DataDictionaryMapper.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.DataDictionaryMapper">
+
+</mapper>

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

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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/BaseController.java

@@ -89,17 +89,29 @@ public class BaseController {
      * @param token
      * @return
      */
-    private String buildKey(String userId, String token) {
+//    private String buildKey(String userId, String token) {
+//
+//       return "region_" + userId + "_" + token;
+// 
+//    }
 
-        return "region_" + userId + "_" + token;
+      private String buildKey(String token) {
+    	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， 
+    	       return "region_" + token;
     	
    	    }
-
     /**
      * 用户选择信息保存redis
      */
     protected void saveSelectedOrgInfo(ReginParams reginParams) {
-        redisUtils.set(buildKey(getUserId(), getToken()), JSONObject.toJSONString(reginParams));
+    	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， 
+     redisUtils.set(buildKey(getToken()), JSONObject.toJSONString(reginParams));
+       
+    }
+    
+    protected void  saveUser(AgencyUserModel agencyUserModel) {
+    	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， 
+     redisUtils.set(getToken(), JSONObject.toJSONString(agencyUserModel));
        
     }
 
@@ -124,7 +136,9 @@ public class BaseController {
      * 用户选择信心redis获取
      **/
     protected ReginParams getSelectedOrgInfo() {
-        return JSONObject.parseObject(redisUtils.get(buildKey(getUserId(), getToken())).toString(), ReginParams.class);
+    	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， 
+       // return JSONObject.parseObject(redisUtils.get(buildKey(getUserId(), getToken())).toString(), ReginParams.class);
+    	return JSONObject.parseObject(redisUtils.get(buildKey( getToken())).toString(), ReginParams.class);
     }
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/DataDictionaryDto.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("cb_data_dictionary")
+@ApiModel(value="DataDictionaryDto", description="数据字典")
+public class DataDictionaryDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/DataDictionary.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;
+/**
+* 数据字典
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_data_dictionary")
+@ApiModel(value="DataDictionary对象", description="数据字典")
+public class DataDictionary extends BaseEntity  {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+	
+
+}

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -78,10 +81,12 @@ public class FireExperts extends BaseEntity {
     private String mobilePhone;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
-    @ApiModelProperty(value = "操作人员")
-    private String operationUesr;
+    @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
+    private String recUserName;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -35,6 +38,9 @@ public class FireTeam extends BaseEntity {
     @ApiModelProperty(value = "单位名称")
     private String name;
     
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
     @ApiModelProperty(value = "所属机构")
     private Long company;
 
@@ -59,13 +65,23 @@ public class FireTeam extends BaseEntity {
     @ApiModelProperty(value = "纬度")
     private Double latitude;
     
+    @ApiModelProperty(value = "队伍地址")
+    private String address;
+    
     @ApiModelProperty(value = "机构名称")
     private String companyName;
+    @ApiModelProperty(value = "队伍类型")
+    private String type;
+    @ApiModelProperty(value = "队伍code")
+    private String typeCode;
+   
     
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -50,6 +53,10 @@ public class Firefighters extends BaseEntity {
     @ApiModelProperty(value = "常用证件类型代码")
     private String certificatesType;
 
+    @ApiModelProperty(value = "常用证件类型代码code")
+    private String certificatesTypeCode;
+
+
     @ApiModelProperty(value = "证件号码")
     private String certificateNumber;
 
@@ -77,8 +84,14 @@ public class Firefighters extends BaseEntity {
     @ApiModelProperty(value = "岗位名称")
     private String jobTitle;
 
+    
+    @ApiModelProperty(value = "岗位名称数据字典code")
+    private String jobTitleCode;
+    
     @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
+    @ApiModelProperty(value = "人员状态，在职/离职字典code")
+    private String stateCode;
 
     @ApiModelProperty(value = "婚姻状况")
     private String maritalStatus;
@@ -105,9 +118,11 @@ public class Firefighters extends BaseEntity {
     private String idReverse;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
     @ApiModelProperty(value = "机构名称")

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -42,9 +45,11 @@ public class FirefightersContacts extends BaseEntity {
     private String emergencyContactPhone;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -52,14 +55,18 @@ public class FirefightersContract extends BaseEntity {
 
     @ApiModelProperty(value = "合同类型")
     private String contractType;
+    @ApiModelProperty(value = "合同类型字典code")
+    private String contractTypeCode;
     
     @ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -48,9 +51,11 @@ public class FirefightersEducation extends BaseEntity {
     private String professionalName;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -51,9 +54,11 @@ public class FirefightersJacket extends BaseEntity {
     private Date allotmentTime;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -44,8 +47,8 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "消防救援人员类别")
     private String category;
 
-    @ApiModelProperty(value = "消防救援人员状态")
-    private String state;
+//    @ApiModelProperty(value = "消防救援人员状态")
+//    private String state;
 
     @ApiModelProperty(value = "消防救援衔级别代码")
     private String level;
@@ -56,13 +59,40 @@ public class FirefightersPost extends BaseEntity {
     @ApiModelProperty(value = "消防专家领域")
     private String areasExpertise;
 
+    
+    @ApiModelProperty(value = "员工层级字典code")
+    private String employeeHierarchyCode;
+
+    @ApiModelProperty(value = "行政职务字典code")
+    private String administrativePositionCode;
+
+    @ApiModelProperty(value = "岗位资质字典code")
+    private String postQualificationCode;
+
+    @ApiModelProperty(value = "消防救援人员类别字典code")
+    private String categoryCode;
+
+//    @ApiModelProperty(value = "消防救援人员状态")
+//    private String stateCode;
+
+    @ApiModelProperty(value = "消防救援衔级别代码字典code")
+    private String levelCode;
+
+    @ApiModelProperty(value = "资质证书字典code")
+    private String qualificationCertificateCode;
+
+    @ApiModelProperty(value = "消防专家领域字典code")
+    private String areasExpertiseCode;
+    
     @ApiModelProperty(value = "是否专家_判断标识")
     private String isnoExpert;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -32,118 +35,29 @@ public class FirefightersThought extends BaseEntity {
     @ApiModelProperty(value = "消防救援人员")
     private Long firefightersId;
 
-    @ApiModelProperty(value = "填表时间")
-    private Date fillingTime;
-
-    @ApiModelProperty(value = "填表人（谈话人）")
-    private String preparer;
-
-    @ApiModelProperty(value = "政治立场")
-    private String politicalPosition;
-
-    @ApiModelProperty(value = "政治立场")
-    private String politicalPositionNote;
+    @ApiModelProperty(value = "谈话时间")
+    private Date talkingTime;
 
-    @ApiModelProperty(value = "思想品德")
+    @ApiModelProperty(value = "思想和现实表现情况")
     private String thoughtMorality;
 
-    @ApiModelProperty(value = "使命意识")
-    private String senseMission;
-
-    @ApiModelProperty(value = "入队动机")
-    private String teamMotivation;
-
-    @ApiModelProperty(value = "入队动机")
-    private String teamMotivationNote;
-
-    @ApiModelProperty(value = "法纪意识")
-    private String disciplineConsciousness;
-
-    @ApiModelProperty(value = "法纪意识")
-    private String disciplineConsciousnessNote;
-
-    @ApiModelProperty(value = "服从意识")
-    private String obedienceConsciousness;
-
-    @ApiModelProperty(value = "服从意识")
-    private String obedienceConsciousnessNote;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String hobby;
-
-    @ApiModelProperty(value = "兴趣爱好")
-    private String hobbyNote;
-
-    @ApiModelProperty(value = "身体状况")
-    private String physicalCondition;
-
-    @ApiModelProperty(value = "身体状况备注")
-    private String physicalConditionNote;
-
-    @ApiModelProperty(value = "性格特征心理品质")
-    private String psychologicalQuality;
-
-    @ApiModelProperty(value = "性格特征心理品质")
-    private String psychologicalQualityNote;
-
-    @ApiModelProperty(value = "自控能力")
-    private String selfControl;
-
-    @ApiModelProperty(value = "自控能力")
-    private String selfControlNote;
-
-    @ApiModelProperty(value = "反应能力")
-    private String reaction;
-
-    @ApiModelProperty(value = "反应能力")
-    private String reactionNote;
-
-    @ApiModelProperty(value = "社交关系")
-    private String socialRelations;
-
-    @ApiModelProperty(value = "社交关系")
-    private String socialRelationsNote;
-
-    @ApiModelProperty(value = "内部关系")
-    private String internal;
-
-    @ApiModelProperty(value = "内部关系")
-    private String internalNote;
-
-    @ApiModelProperty(value = "群众威信")
-    private String authority;
-
-    @ApiModelProperty(value = "群众威信")
-    private String authorityNote;
-
-    @ApiModelProperty(value = "家庭条件")
-    private String familyConditions;
-
-    @ApiModelProperty(value = "日常花销")
-    private String dailySpending;
-
-    @ApiModelProperty(value = "日常花销")
-    private String dailySpendingNote;
-
-    @ApiModelProperty(value = "抗压能力")
-    private String compressiveAbility;
+    @ApiModelProperty(value = "时机原因")
+    private String timingReasons;
 
-    @ApiModelProperty(value = "抗压能力")
-    private String compressiveAbilityNote;
+    @ApiModelProperty(value = "工作措施")
+    private String workingMeasures;
 
-    @ApiModelProperty(value = "业余时间主要活动")
-    private String leisureActivities;
+    @ApiModelProperty(value = "附件")
+    private String enclosure;
 
-    @ApiModelProperty(value = "工资津贴花费去向")
-    private String payTo;
     
-    @ApiModelProperty(value = "备注")
-    private String note;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

@@ -8,7 +8,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -39,9 +42,11 @@ public class FirefightersWorkexperience extends BaseEntity {
     private Long firefightersId;
 
     @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "操作人名称")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
     private String recUserName;
 
 }

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

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

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +19,21 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface FireTeamMapper extends BaseMapper<FireTeam> {
 
+	@Select("<script>"
+	+ "select a.sequence_nbr sequenceNbr, a.img,a.name,a.contact_user contactUser,a.contact_phone contactPhone, a.address from cb_fire_team a  where a.is_delete=0"
+	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
+	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
+	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
+	+ "<if test='par.name!=null'>" + "and a.name= #{par.name}" + "</if>"
+	+ "</script>")
+	List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par);
+	@Select("<script>"
+	+ "select COUNT(a.sequence_nbr) num from cb_fire_team a  where a.is_delete=0"
+	+ "<if test='par.parent!=null'>" + "and a.parent= #{par.parent}" + "</if>"
+	+ "<if test='par.typeCode!=null'>" + "and a.type_code= #{par.typeCode}" + "</if>"
+	+ "<if test='par.companyCode!=null'>" + "and a.company_code= #{par.companyCode}" + "</if>"
+	+ "<if test='par.name!=null'>" + " and a.name= #{par.name}" + "</if>"
+	+ "</script>")
+	Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par);
+
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,4 +19,39 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface FirefightersMapper extends BaseMapper<Firefighters> {
 	
+	
+/**
+ * 
+ * 消防人员首页列表
+ *
+ ***/	
+@Select("<script>"
++ "select a.* from  cb_firefighters a LEFT JOIN cb_firefighters_post b  on a.sequence_nbr=b.firefighters_id where a.is_delete=0 "
++ "<if test='par.postQualification!=null'>" + "and b.post_qualification_code = #{par.postQualification}" + "</if>"
++ "<if test='par.areasExpertise!=null'>" + "and b.areas_expertise_code= #{par.areasExpertise}" + "</if>"
++ "<if test='par.name!=null'>" + "and a.name= #{par.name}" + "</if>"
++ "<if test='par.state!=null'>" + "and a.state_code= #{par.state}" + "</if>"
++ "<if test='par.fireTeamId!=null'>" + "and a.fire_team_id= #{par.fireTeamId}" + "</if>"
++ "<if test='par.jobTitle!=null'>" + "and a.job_title_code =#{par.jobTitle}" + "</if>"
++" limit 0,#{pageSize}"
++ "</script>")	 
+List<Firefighters>getFirefighters(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
+@Select("<script>"
++ "select COUNT(a.sequence_nbr) num from  cb_firefighters a LEFT JOIN cb_firefighters_post b  on a.sequence_nbr=b.firefighters_id where a.is_delete=0 "
++ "<if test='par.postQualification!=null'>" + "and b.post_qualification_code = #{par.postQualification}" + "</if>"
++ "<if test='par.areasExpertise!=null'>" + "and b.areas_expertise_code= #{par.areasExpertise}" + "</if>"
++ "<if test='par.name!=null'>" + "and a.name= #{par.name}" + "</if>"
++ "<if test='par.state!=null'>" + "and a.state_code= #{par.state}" + "</if>"
++ "<if test='par.fireTeamId!=null'>" + "and a.fire_team_id= #{par.fireTeamId}" + "</if>"
++ "<if test='par.jobTitle!=null'>" + "and a.job_title_code= #{par.jobTitle}" + "</if>"
++"limit 0,#{pageSize}"
++ "</script>")	 
+Map<String, Long>getFirefightersCount(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FirefightersListVo par);
+
+@Select("<script>"
++ "SELECT IFNULL(a.personnel_photos,'') personnelPhotos,	a.sequence_nbr sequenceNbr,IFNULL(a.`name`,'无')`name`,	IFNULL(a.job_title,'无') jobTitle,	IFNULL(b.administrative_position,'无') administrativePosition,	IFNULL(c.`name`,'无') fireTeamName,	IFNULL(a.state,'无') state,	IFNULL(b.employee_hierarchy,'无') employeeHierarchy,	IFNULL(b.areas_expertise,'无') areasExpertise,	IFNULL(a.gender,'无') gender, IFNULL(b.post_qualification,'无') postQualification,year( from_days( datediff( now( ), a.birthday_time))) age  	"
++ " FROM	cb_firefighters a	LEFT JOIN cb_firefighters_post b ON a.sequence_nbr = b.firefighters_id 	LEFT JOIN cb_fire_team c on c.sequence_nbr=a.fire_team_id WHERE a.is_delete =0"
++" and a.sequence_nbr=#{id}"
++ "</script>")
+Map<String, Object> listToSelectById(@Param("id")Long  id);
 }

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

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

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -10,5 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @date 2021-06-07
 */
 public interface IFireTeamService extends IService<FireTeam> {
-
+	List<FireTeamVo>getFireTeam(int pageNum,int pageSize,FireTeamListVo  par);
+	Map<String, Long>getFireTeamCount(int pageNum,int pageSize,FireTeamListVo  par);
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface IFirefightersService extends IService<Firefighters> {
 
+	List<Firefighters>getFirefighters(int pageNum,int pageSize,FirefightersListVo par);
+	Map<String, Long>getFirefightersCount(int pageNum,int pageSize,FirefightersListVo par);
+	Map<String, Object> listToSelectById(Long  id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/DataDictionaryVo.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("cb_data_dictionary")
+@ApiModel(value="DataDictionaryVo", description="数据字典")
+public class DataDictionaryVo{
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "父级")
+    private Long parent;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FireTeamListVo.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;
+
+public class FireTeamListVo{
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String name;   
+
+    @ApiModelProperty(value = "机构code")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "队伍code")
+    private String typeCode;
+    
+    @ApiModelProperty(value = "父级id")
+    private Long parent;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCompanyCode() {
+		return companyCode;
+	}
+
+	public void setCompanyCode(String companyCode) {
+		this.companyCode = companyCode;
+	}
+
+	public String getTypeCode() {
+		return typeCode;
+	}
+
+	public void setTypeCode(String typeCode) {
+		this.typeCode = typeCode;
+	}
+
+	public Long getParent() {
+		return parent;
+	}
+
+	public void setParent(Long parent) {
+		this.parent = parent;
+	}
+    
+
+
+}

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

@@ -20,8 +20,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@Accessors(chain = true)
-@TableName("cb_fire_team")
 @ApiModel(value="FireTeamVo", description="消防队伍")
 public class FireTeamVo{
 
@@ -30,41 +28,20 @@ public class FireTeamVo{
 
     @ApiModelProperty(value = "消防队伍图片")
     private String img;
-
     @ApiModelProperty(value = "单位名称")
     private String name;
-
-    @ApiModelProperty(value = "所属机构")
-    private Long company;
-
-    @ApiModelProperty(value = "机构code")
-    private String companyCode;
-
-    @ApiModelProperty(value = "联系人id")
-    private Integer contactUserId;
-
     @ApiModelProperty(value = "联系人")
     private String contactUser;
-
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
+    @ApiModelProperty(value = "队伍地址")
+    private String address;
+    @ApiModelProperty(value = "队伍id")
+    private Long sequenceNbr;
+    @ApiModelProperty(value = "队伍车数量")
+    private Double carNum=0D;
+    @ApiModelProperty(value = "队伍装备数量")
+    private Double eqNum=0D;
     
-    @ApiModelProperty(value = "职责_简要情况")
-    private String obligation;
-
-    @ApiModelProperty(value = "经度")
-    private Double longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private Double latitude;
-
-    @ApiModelProperty(value = "机构名称")
-    private String companyName;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
     
 }

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
+
+public class FirefightersData {
+
+	private FirefightersWorkexperience firefightersWorkexperience;
+	private FirefightersEducation firefightersEducation;
+	private FirefightersPost firefightersPost;
+	
+	public FirefightersWorkexperience getFirefightersWorkexperience() {
+		return firefightersWorkexperience;
+	}
+	public void setFirefightersWorkexperience(FirefightersWorkexperience firefightersWorkexperience) {
+		this.firefightersWorkexperience = firefightersWorkexperience;
+	}
+	public FirefightersEducation getFirefightersEducation() {
+		return firefightersEducation;
+	}
+	public void setFirefightersEducation(FirefightersEducation firefightersEducation) {
+		this.firefightersEducation = firefightersEducation;
+	}
+	public FirefightersPost getFirefightersPost() {
+		return firefightersPost;
+	}
+	public void setFirefightersPost(FirefightersPost firefightersPost) {
+		this.firefightersPost = firefightersPost;
+	}
+	
+	public FirefightersData(FirefightersWorkexperience firefightersWorkexperience,
+			FirefightersEducation firefightersEducation, FirefightersPost firefightersPost) {
+		super();
+		this.firefightersWorkexperience = firefightersWorkexperience;
+		this.firefightersEducation = firefightersEducation;
+		this.firefightersPost = firefightersPost;
+	}
+	public FirefightersData() {
+		super();
+	}
+	
+	
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class FirefightersListVo {
+ @ApiModelProperty(value = "岗位资质")	
+ private String postQualification;
+ @ApiModelProperty(value = "专家领域")
+ private String areasExpertise;
+ @ApiModelProperty(value = "人员名称")
+ private String name;
+ @ApiModelProperty(value = "人员状态")
+ private String state;
+ @ApiModelProperty(value = "队伍id")
+ private String fireTeamId;
+ @ApiModelProperty(value = "岗位名称")
+ private String jobTitle;
+ 
+ 
+public String getPostQualification() {
+	return postQualification;
+}
+public void setPostQualification(String postQualification) {
+	this.postQualification = postQualification;
+}
+public String getAreasExpertise() {
+	return areasExpertise;
+}
+public void setAreasExpertise(String areasExpertise) {
+	this.areasExpertise = areasExpertise;
+}
+public String getName() {
+	return name;
+}
+public void setName(String name) {
+	this.name = name;
+}
+public String getState() {
+	return state;
+}
+public void setState(String state) {
+	this.state = state;
+}
+public String getFireTeamId() {
+	return fireTeamId;
+}
+public void setFireTeamId(String fireTeamId) {
+	this.fireTeamId = fireTeamId;
+}
+public String getJobTitle() {
+	return jobTitle;
+}
+public void setJobTitle(String jobTitle) {
+	this.jobTitle = jobTitle;
+}
+ 
+}

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

 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 com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 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;
+
 /**
 * 消防队员
 *
@@ -20,96 +13,29 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 * @date 2021-06-07
 */
 @Data
-@Accessors(chain = true)
-@TableName("cb_firefighters")
 @ApiModel(value="FirefightersVo", description="消防队员")
 public class FirefightersVo{
 
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "系统账号")
-    private String systemAccount;
-
-    @ApiModelProperty(value = "员工编码")
-    private String employeeNumber;
-
-    @ApiModelProperty(value = "所属机构")
-    private String company;
-
-    @ApiModelProperty(value = "机构code")
-    private String companyCode;
-
-    @ApiModelProperty(value = "队伍id")
-    private Integer fireTeamId;
-
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    @ApiModelProperty(value = "常用证件类型代码")
-    private String certificatesType;
-
-    @ApiModelProperty(value = "证件号码")
-    private String certificateNumber;
-
-    @ApiModelProperty(value = "出生日期")
-    private Date birthdayTime;
-
-    @ApiModelProperty(value = "性别")
-    private String gender;
-
-    @ApiModelProperty(value = "民族")
-    private String nation;
-
-    @ApiModelProperty(value = "籍贯/户口所在地")
-    private String nativePlace;
-
-    @ApiModelProperty(value = "现居住地")
-    private String residence;
-
-    @ApiModelProperty(value = "现居住地详情")
-    private String residenceDetails;
-
-    @ApiModelProperty(value = "机场住宿情况")
-    private String airportAccommodation;
-
-    @ApiModelProperty(value = "岗位名称")
-    private String jobTitle;
-
-    @ApiModelProperty(value = "人员状态，在职/离职")
-    private String state;
-
-    @ApiModelProperty(value = "婚姻状况")
-    private String maritalStatus;
-
-    @ApiModelProperty(value = "办公电话")
-    private String officeTelephone;
     
-    @ApiModelProperty(value = "手机")
-    private String mobilePhone;
 
-    @ApiModelProperty(value = "互联网_电子信箱")
-    private String email;
+    @ApiModelProperty(value = "基本信息")
+    private Firefighters firefighters;
 
-    @ApiModelProperty(value = "政治面貌代码")
-    private String politicalOutlook;
+    @ApiModelProperty(value = "联系人信息")
+    private FirefightersContacts firefightersContacts;
 
-    @ApiModelProperty(value = "人员照片")
-    private String personnelPhotos;
+	public FirefightersVo(Firefighters firefighters, FirefightersContacts firefightersContacts) {
+		super();
+		this.firefighters = firefighters;
+		this.firefightersContacts = firefightersContacts;
+	}
 
-    @ApiModelProperty(value = "身份证正面")
-    private String idPositive;
+	public FirefightersVo() {
+		super();
+	}
 
-    @ApiModelProperty(value = "身份证反面")
-    private String idReverse;
     
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
  
-    @ApiModelProperty(value = "机构名称")
-    private String companyName;
 
 }

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import java.util.List;
+
+
+public class Menu {
+	    public Long id;  
+	    public String name;  
+	    public Long parentId;  
+	    public List<Menu> children;
+		public Menu(Long id, String name, Long parentId2) {
+			super();
+			this.id = id;
+			this.name = name;
+			this.parentId = parentId2;			
+		}
+		
+		public Menu(Long id, String name, Long parentId, List<Menu> children) {
+			super();
+			this.id = id;
+			this.name = name;
+			this.parentId = parentId;
+			this.children = children;
+		}
+
+		public Long getId() {
+			return id;
+		}
+		public void setId(Long id) {
+			this.id = id;
+		}
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public Long getParentId() {
+			return parentId;
+		}
+		public void setParentId(Long parentId) {
+			this.parentId = parentId;
+		}
+
+		public List<Menu> getChildren() {
+			return children;
+		}
+
+		public void setChildren(List<Menu> children) {
+			this.children = children;
+		}
+		
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
+
+public class TreeParser{  
+//    /** 
+//     * 解析树形数据 
+//     * @param topId 
+//     * @param entityList 
+//
+//     */  
+//    public static List<Menu> getTreeList(Long topId, Collection<DataDictionary> entityList) {  
+//        List<Menu> resultList=new ArrayList<>();  
+//          
+//        //获取顶层元素集合  
+//        Long parentId;  
+//        for (DataDictionary entity : entityList) {  
+//            parentId=entity.getParent();  
+//            if(parentId==null||topId==parentId){  
+//            	Menu menu=new Menu(Long.valueOf(entity.getCode()), entity.getName(), parentId);
+//                resultList.add(menu);  
+//            }  
+//        }  
+//          
+//        //获取每个顶层元素的子数据集合  
+//        for (Menu entity : resultList) {  
+//            entity.setChildren(getSubList(entity.getId(),entityList));  
+//        }  
+//          
+//        return resultList;  
+//    }  
+//      
+//    /** 
+//     * 获取子数据集合 
+//     */  
+//    private  static List<Menu> getSubList(Long id, Collection<DataDictionary> entityList) {  
+//        List<Menu> childList=new ArrayList<>();  
+//        Long parentId;  
+//          
+//        //子集的直接子对象  
+//        for (DataDictionary entity : entityList) {  
+//            parentId=entity.getParent();  
+//            if(id.equals(parentId)){  
+//            	Menu menu=new Menu(Long.valueOf(entity.getCode()), entity.getName(), parentId);
+//            	childList.add(menu);  
+//            }  
+//        }  
+//          
+//        //子集的间接子对象  
+//        for (Menu entity : childList) {  
+//            entity.setChildren(getSubList(entity.getId(), entityList));  
+//        }  
+//          
+//        //递归退出条件  
+//        if(childList.size()==0){  
+//            return null;  
+//        }  
+//          
+//        return childList;  
+//    }  
+    
+
+    
+    
+    
+
+
+	/*
+	 * @param topId  父id
+	 * @param entityList  数据集合
+	 * @param packageURL 集合对象包名+类名
+	 * @param IDMethodName  集合对象获取树id 方法名
+	 * @param IDHierarchy  集合对象获取树id 来源于自己 还是父级(  1自己，2 父级 ，3 父级的父级)
+	 * @param NAMEMethodName 集合对象获取树name 方法名
+	 * @param PARENTIDMethodName 集合对象获取树父id 方法名
+	 * @return java.util.List<com.yeejoin.amos.boot.module.jcs.api.vo.Menu>
+	 * <PRE>
+	 * author tw
+	 * date 2021/6/10
+	 * </PRE>
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<Menu> getTree(Long topId, Collection entityList,String packageURL,String IDMethodName,int IDHierarchy, String NAMEMethodName,String PARENTIDMethodName ) throws Exception{
+        List<Menu> resultList=new ArrayList<>();
+        Class clazz=  Class.forName(packageURL);
+        Method IDMethodNameme = null;
+        switch (IDHierarchy) { case 1:
+			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+			break;
+        case 2:
+        	IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+			break;
+        case 3:
+        	IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+	    break;
+		default:
+			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+			break;
+		}
+    	
+     	Method NAMEMethodNameme =     clazz.getDeclaredMethod(NAMEMethodName);
+     	Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+        //获取顶层元素集合  
+        Long parentId=null;  
+        for (Object ob : entityList) {         	
+        	Object entity = clazz.cast(ob);         	
+        	if(PARENTIDMethodNameme.invoke(entity)!=null) {
+        	   parentId= Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)));	
+        	}         
+            if(parentId==null||topId==parentId){  
+            	Menu menu=new Menu(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId);
+                resultList.add(menu);  
+            }  
+        }           
+        //获取每个顶层元素的子数据集合  
+        for (Menu entity : resultList) {  
+            entity.setChildren(getSub(entity.getId(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName));  
+        }  
+          
+        return resultList;   
+    }  
+      
+    /** 
+     * 获取子数据集合 
+     */  
+    private  static List<Menu> getSub(Long topId, Collection entityList,String packageURL,String IDMethodName,int IDHierarchy,String NAMEMethodName,String PARENTIDMethodName ) throws Exception{  
+    	  List<Menu> childList=new ArrayList<>();   
+         Class clazz=  Class.forName(packageURL);
+         Method IDMethodNameme = null;
+         switch (IDHierarchy) {
+ 		case 1:
+ 			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+ 			break;
+         case 2:
+         	IDMethodNameme = clazz.getSuperclass().getDeclaredMethod(IDMethodName);
+ 			break;
+         case 3:
+         	IDMethodNameme = clazz.getSuperclass().getSuperclass().getDeclaredMethod(IDMethodName);
+ 	    break;
+ 		default:
+ 			IDMethodNameme = clazz.getDeclaredMethod(IDMethodName);
+ 			break;
+ 		}
+     	Method NAMEMethodNameme =  clazz.getDeclaredMethod(NAMEMethodName);
+     	Method PARENTIDMethodNameme = clazz.getDeclaredMethod(PARENTIDMethodName);
+     	 Long parentId=null;   
+        //子集的直接子对象  
+     	 for (Object ob : entityList) { 
+     		Object entity = clazz.cast(ob);     
+     		if(PARENTIDMethodNameme.invoke(entity)!=null) {
+         	   parentId= Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)));	
+         	}  
+             if(topId==parentId){  
+             	Menu menu=new Menu(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))), String.valueOf(NAMEMethodNameme.invoke(entity)), parentId);
+             	childList.add(menu);  
+             }  
+        }  
+          
+        //子集的间接子对象  
+        for (Menu entity : childList) {  
+            entity.setChildren(getSub(entity.getId(), entityList, packageURL, IDMethodName,IDHierarchy, NAMEMethodName, PARENTIDMethodName));  
+        }  
+          
+        //递归退出条件  
+        if(childList.size()==0){  
+            return null;  
+        }  
+          
+        return childList;  
+    } 
+} 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/DataDictionaryMapper.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.DataDictionaryMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/DataDictionaryController.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.IDataDictionaryService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.Menu;
+import com.yeejoin.amos.boot.module.jcs.api.vo.TreeParser;
+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.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
+import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+* 数据字典
+*
+* @author tb
+* @date 2021-06-07
+*/
+@RestController
+@Api(tags = "数据字典Api")
+@RequestMapping(value = "/jcs/data-dictionary")
+public class DataDictionaryController extends BaseController {
+
+    @Autowired
+    IDataDictionaryService iDataDictionaryService;
+
+    /**
+    * 新增数据字典
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
+    public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
+        return iDataDictionaryService.save(dataDictionary);
+    }
+
+    /**
+    * 根据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 iDataDictionaryService.removeById(id);
+    }
+
+
+
+
+    /**
+    * 修改数据字典
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
+    @ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
+    public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
+        return iDataDictionaryService.updateById(dataDictionary);
+    }
+
+
+
+    /**
+    * 根据id查询
+    * @param id
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
+    public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id){
+        return iDataDictionaryService.getById(id);
+    }
+
+
+
+    /**
+    * 列表分页查询
+    * @return
+    */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
+    public IPage<DataDictionary> listPage(String pageNum,String pageSize, DataDictionary dataDictionary){
+
+        Page<DataDictionary> pageBean;
+        QueryWrapper<DataDictionary> dataDictionaryQueryWrapper = new QueryWrapper<>();
+        Class<? extends DataDictionary> aClass = dataDictionary.getClass();
+        Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+            try {
+                field.setAccessible(true);
+                Object o = field.get(dataDictionary);
+                if (o != null) {
+                    Class<?> type = field.getType();
+                    String name = NameUtils.camel2Underline(field.getName());
+                    if (type.equals(Integer.class)) {
+                        Integer fileValue = (Integer) field.get(dataDictionary);
+                        dataDictionaryQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(Long.class)) {
+                        Long fileValue = (Long) field.get(dataDictionary);
+                        dataDictionaryQueryWrapper.eq(name, fileValue);
+                    } else if (type.equals(String.class)) {
+                        String fileValue = (String) field.get(dataDictionary);
+                        dataDictionaryQueryWrapper.eq(name, fileValue);
+                    } else {
+                        String fileValue = (String) field.get(dataDictionary);
+                        dataDictionaryQueryWrapper.eq(name, fileValue);
+                    }
+                }
+            } catch (Exception e) {
+            }
+        });
+        IPage<DataDictionary> 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 = iDataDictionaryService.page(pageBean, dataDictionaryQueryWrapper);
+            return page;
+        }
+     
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+    public ResponseModel gwmcDataDictionary( @PathVariable String type) throws Exception{
+    	Map<String, Object> columnMap =new HashMap<>();
+    	columnMap.put("type", type);
+        Collection<DataDictionary> list=iDataDictionaryService.listByMap(columnMap);
+        List<Menu> menus=TreeParser.getTree(null, list,  DataDictionary.class.getName(),"getCode",0, "getName", "getParent");   
+        return CommonResponseUtil.success(menus);  	
+    } 
+    }
+

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

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

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

@@ -3,7 +3,14 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,4 +22,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class FireTeamServiceImpl extends ServiceImpl<FireTeamMapper, FireTeam> implements IFireTeamService {
     
+	@Autowired
+	FireTeamMapper fireTeamMapper;
+	@Override
+	public List<FireTeamVo> getFireTeam(int pageNum, int pageSize, FireTeamListVo par) {
+		// TODO Auto-generated method stub
+		return fireTeamMapper.getFireTeam( pageNum,  pageSize,  par) ;
+	}
+
+	@Override
+	public Map<String, Long> getFireTeamCount(int pageNum, int pageSize, FireTeamListVo par) {
+		// TODO Auto-generated method stub
+		return fireTeamMapper.getFireTeamCount( pageNum,  pageSize,  par) ;
+	}
+
 }

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

@@ -3,7 +3,13 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,4 +21,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class FirefightersServiceImpl extends ServiceImpl<FirefightersMapper, Firefighters> implements IFirefightersService {
 
+	 @Autowired
+	 FirefightersMapper firefightersMapper;
+	
+	@Override
+	public List<Firefighters> getFirefighters(int pageNum, int pageSize, FirefightersListVo par) {		
+		return firefightersMapper.getFirefighters(pageNum, pageSize, par);
+	}
+
+	@Override
+	public Map<String, Long>  getFirefightersCount(int pageNum, int pageSize, FirefightersListVo par) {
+		// TODO Auto-generated method stub
+		return firefightersMapper.getFirefightersCount(pageNum, pageSize, par);
+	}
+
+	@Override
+	public Map<String, Object> listToSelectById(Long id) {
+		// TODO Auto-generated method stub
+		return firefightersMapper.listToSelectById(id);
+	}
+
 }

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

@@ -34,10 +34,7 @@ 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;
 
@@ -224,38 +221,9 @@ public class RemoteSecurityService {
 
     }
 
-    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) {