Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -17,12 +17,17 @@ import java.util.Date;
 @Data
 public class BaseEntity implements Serializable{
 	
-	    @TableId(value = "SEQUENCE_NBR" , type = IdType.ID_WORKER)
+	    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+		@TableId(value = "sequence_nbr" , type = IdType.ID_WORKER)
 	    protected Long sequenceNbr;
 
-	    @TableField(value = "REC_DATE",fill=FieldFill.INSERT_UPDATE )
+	    @TableField(value = "rec_data",fill=FieldFill.INSERT_UPDATE )
 	    protected Date recDate;
-	    @TableField(value = "REC_USER_ID",fill=FieldFill.INSERT_UPDATE )
+	    @TableField(value = "rec_user_id",fill=FieldFill.INSERT_UPDATE )
 	    protected String recUserId;
 	    /**
 	     * 是否删除

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/client/EquipFeignClient.java

+package com.yeejoin.amos.boot.module.jcs.api.client;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
+import org.springframework.cloud.openfeign.FeignClient;
+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.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 装备服务feign
+ *
+ * @author Dell
+ */
+@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip", configuration = {MultipartSupportConfig.class})
+public interface EquipFeignClient {
+
+    /**
+     * 获取未列装人员装备列表数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/equipSpecific/getAirEquipSpecificPage", method = RequestMethod.POST)
+    ResponseModel<Page<EquipmentOnCarDto>> getAirEquipSpecificPage(@RequestBody EquipSpecificDto var1) throws InnerInvokException;
+    /**
+     * 人员装备列装
+     *
+     * @return
+     */
+    @RequestMapping(value = "/stock-detail/airport/person/bind", method = RequestMethod.POST)
+    ResponseModel<List<Object>> stockBindEquip(@RequestBody List<Long> ids) throws InnerInvokException;
+    /**
+     * 人员装备退装
+     *
+     * @return
+     */
+    @RequestMapping(value = "/scrap/airport/person", method = RequestMethod.POST)
+    ResponseModel<Object> scrapEquip(@RequestBody String id) throws InnerInvokException;
+    /**
+     * 人员装备回库
+     *
+     * @return
+     */
+    @RequestMapping(value = "/stock-detail/airport/person", method = RequestMethod.POST)
+    ResponseModel<Object> stockEquip(@RequestBody Map<String, Object> map) throws InnerInvokException;
+    /**
+     * 装备详情
+     *
+     * @return
+     */
+    @RequestMapping(value = "/equipSpecific/getAirEquipSpecificDetail", method = RequestMethod.GET)
+    ResponseModel<Object> getAirEquipSpecificDetail(@RequestParam Long stockDetailId) throws InnerInvokException;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/client/MultipartSupportConfig.java

+package com.yeejoin.amos.boot.module.jcs.api.client;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2020/3/30 16:26
+ */
+@Configuration
+public class MultipartSupportConfig {
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+}

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertCalledDto", description="警情接警记录")
 public class AlertCalledDto extends BaseDto{
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 警情表单
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertFromDto", description="警情表单")
 public class AlertFromDto extends BaseDto{
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 动态表单类型
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertFromTypeDto", description="动态表单类型")
 public class AlertFromTypeDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertFromValueDto", description="")
 public class AlertFromValueDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertSubmittedDto", description="警情报送记录")
 public class AlertSubmittedDto extends BaseDto{
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 报送对象
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="AlertSubmittedObjectDto", description="报送对象")
 public class AlertSubmittedObjectDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 数据字典
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="DataDictionaryDto", description="数据字典")
 public class DataDictionaryDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -2,10 +2,12 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import java.util.Date;
 
-import org.springframework.data.annotation.Id;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 
@@ -17,11 +19,14 @@ import lombok.Data;
  * @version $Id: ESAlertCalledDto.java, v 0.1 2021年6月23日 下午1:52:07 gwb Exp $
  */
 @Data
-public class ESAlertCalledDto {
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ESAlertCalledDto", description="ES警情信息")
+public class ESAlertCalledDto extends BaseDto {
 
-    /** 主键 */
-    @Id
-    private Long sequenceNbr;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
     /**
      * 警情状态
      */

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ESAlertCalledRequestDto extends AlertCalledVo
+{
+	@ApiModelProperty(value = "警情状态")
+    private String[] alertStatus;
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Author: xl
+ * @Description: 装备分页查询
+ * @Date: 2021/6/23 11:29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EquipSpecificDto extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 名称
+     */
+    private String like;
+    /**
+     * 状态,默认查询未列装数据
+     */
+    private Integer status = 1;
+    /**
+     * 装备分类code（人员装备【10000000】）
+     */
+    private String categoryCode = "10000000";
+    /**
+     * 队伍ID
+     */
+    private Long teamId;
+    /**
+     * 分页
+     */
+    private Page<?> page;
+
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: xl
+ * @Description: 装备返回实例
+ * @Date: 2021/6/23 11:29
+ */
+@Data
+public class EquipmentOnCarDto {
+    /**
+     * 车辆ID
+     */
+    private Long carId;
+    /**
+     * 设备模板ID
+     */
+    private Long equipmentDetailId;
+    /**
+     * 库存详情id
+     */
+    private Long stockDetailId;
+    /**
+     * 库存数量
+     */
+    private Double amount;
+    /**
+     * 设备实例ID
+     */
+    private Long equipmentSpecificId;
+    /**
+     * 设备名称
+     */
+    private String equipmentSpecificName;
+    /**
+     * 设备编码
+     */
+    private String equipmentSpecificCode;
+    /**
+     * 装备类型
+     */
+    private String equipmentName;
+    /**
+     * 状态
+     */
+    private String status;
+
+    private String area;
+
+    private Long warehouseId;
+
+    private Long warehouseStructureId;
+
+    private Long equipmentOnCarId;
+
+    /**
+     * 创建日期
+     */
+    private Date createDate;
+
+    private String equipDefinitionName;
+}

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FireExpertsDto", description="")
 public class FireExpertsDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FireTeamDto", description="消防队伍")
 public class FireTeamDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersContactsDto", description="l联系人")
 public class FirefightersContactsDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersContractDto", description="消防员合同")
 public class FirefightersContractDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersDto", description="消防队员")
 public class FirefightersDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersEducationDto", description="人员学历")
 public class FirefightersEducationDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersJacketDto", description="消防人员配装记录")
 public class FirefightersJacketDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersPostDto", description="岗位信息")
 public class FirefightersPostDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersThoughtDto", description="消防员思想谈话记录")
 public class FirefightersThoughtDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 /**
@@ -13,6 +14,7 @@ import java.util.Date;
 * @date 2021-06-07
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="FirefightersWorkexperienceDto", description="工作经历")
 public class FirefightersWorkexperienceDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -7,17 +7,24 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author fengwang
  * @date 2021-06-18.
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="OrgUsr对象", description="部门信息")
 public class OrgDepartmentDto extends BaseDto {
 
 
-    @ApiModelProperty(value = "部门名称")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "部门名称")
     private String bizOrgName;
 
     @ApiModelProperty(value = "部门编码")

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

@@ -7,17 +7,24 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author fengwang
  * @date 2021-06-18.
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="OrgUsr对象", description="人员信息")
 public class OrgPersonDto extends BaseDto {
 
 
-    @ApiModelProperty(value = "人员名称")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "人员名称")
     private String bizOrgName;
 
     @ApiModelProperty(value = "人员编码")

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 
 *
@@ -10,6 +11,7 @@ import lombok.Data;
 * @date 2021-06-18
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="OrgUsrAuthDto", description="")
 public class OrgUsrAuthDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
 * 机构/部门/人员表
@@ -14,6 +15,7 @@ import lombok.Data;
 * @date 2021-06-18
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="OrgUsrDto", description="机构/部门/人员表")
 public class OrgUsrDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="PowerTransferCompanyDto", description="调派单位")
 public class PowerTransferCompanyDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
 * 调派单位资源
 *
@@ -11,6 +12,7 @@ import lombok.Data;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="PowerTransferCompanyResourcesDto", description="调派单位资源")
 public class PowerTransferCompanyResourcesDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
 * @date 2021-06-17
 */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value="PowerTransferDto", description="力量调派")
 public class PowerTransferDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author DELL
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class SubmitTargetCompanyDto extends BaseDto {
 
     /**

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

@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 警情报送目标人员dto
  * @author DELL
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class SubmitTargetPersonDto extends BaseDto{
 
     /**

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 模板表
@@ -12,6 +13,7 @@ import lombok.Data;
  * @date 2021-06-17
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "TemplateDto", description = "模板表")
 public class TemplateDto extends BaseDto {
     private static final long serialVersionUID = 1L;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 模板表扩展dto
@@ -12,6 +12,7 @@ import lombok.Data;
  * @date 2021-06-17
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "TemplateExtendDto", description = "模板表扩展dto")
 public class TemplateExtendDto extends TemplateDto {
     private static final long serialVersionUID = 1L;

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

@@ -22,7 +22,12 @@ import java.util.Date;
 @TableName("jc_alert_called")
 @ApiModel(value="AlertCalled对象", description="警情接警记录")
 public class AlertCalled extends BaseEntity {
-    @ApiModelProperty(value = "警情状态")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "警情状态")
     private Boolean alertStatus;
 
     @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/AlertForm.java

@@ -20,7 +20,12 @@ import lombok.experimental.Accessors;
 @ApiModel(value="AlertForm对象", description="警情表单")
 public class AlertForm extends BaseEntity {
 
-    @ApiModelProperty(value = "警情类型")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "警情类型")
     private String alertTypeCode;
 
     @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/AlertFormType.java

@@ -19,11 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_form_type")
 @ApiModel(value="AlertFormType对象", description="动态表单类型")
 public class AlertFormType extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "表单类型code")
+	@ApiModelProperty(value = "表单类型code")
     private String alertTypeCode;
 
     @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/AlertFormValue.java

@@ -19,7 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_form_value")
 @ApiModel(value="AlertFormValue对象", description="")
 public class AlertFormValue extends BaseEntity {
-    @ApiModelProperty(value = "表单id")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "表单id")
     private Long alertFormId;
 
     @ApiModelProperty(value = "警情id")

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

@@ -21,11 +21,12 @@ import java.util.Date;
 @TableName("jc_alert_submitted")
 @ApiModel(value="AlertSubmitted对象", description="警情报送记录")
 public class AlertSubmitted extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "警情id")
+	@ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
     @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/AlertSubmittedObject.java

@@ -19,11 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_alert_submitted_object")
 @ApiModel(value="AlertSubmittedObject对象", description="报送对象")
 public class AlertSubmittedObject extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "报送单据id")
+	@ApiModelProperty(value = "报送单据id")
     private Long alertSubmittedId;
 
     @ApiModelProperty(value = "0人员1队伍")

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

@@ -19,7 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("cb_data_dictionary")
 @ApiModel(value="DataDictionary对象", description="数据字典")
 public class DataDictionary extends BaseEntity {
-    @ApiModelProperty(value = "code")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "code")
     private String code;
 
     @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/ESAlertCalled.java

@@ -31,9 +31,14 @@ public class ESAlertCalled {
     /**
      * 警情状态
      */
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Boolean, index = false)
     private Boolean alertStatus;
     /**
+     * 警情状态
+     */
+    @Field(type = FieldType.Text)
+    private String alertStatusStr;
+    /**
      * 响应级别字典code 为了过滤用（只有航空器故障有）
      */
     @Field(type = FieldType.Text, index = false)

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_fire_experts")
 @ApiModel(value="FireExperts对象", description="")
 public class FireExperts extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "姓名")
+	@ApiModelProperty(value = "姓名")
     private String name;
 
     @ApiModelProperty(value = "证件类型")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_fire_team")
 @ApiModel(value="FireTeam对象", description="消防队伍")
 public class FireTeam extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "消防队伍图片")
+	@ApiModelProperty(value = "消防队伍图片")
     private String img;
 
     @ApiModelProperty(value = "单位名称")

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

@@ -23,10 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters")
 @ApiModel(value="Firefighters对象", description="消防队员")
 public class Firefighters extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-    @ApiModelProperty(value = "系统账号")
+	@ApiModelProperty(value = "系统账号")
     private String systemAccount;
 
     @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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_contacts")
 @ApiModel(value="FirefightersContacts对象", description="联系人")
 public class FirefightersContacts extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @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/FirefightersContract.java

@@ -24,11 +24,12 @@ import java.util.Date;
 @TableName("cb_firefighters_contract")
 @ApiModel(value="FirefightersContract对象", description="消防员合同")
 public class FirefightersContract extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "合同名称")
+	@ApiModelProperty(value = "合同名称")
     private String name;
 
     @ApiModelProperty(value = "甲方")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_education")
 @ApiModel(value="FirefightersEducation对象", description="人员学历")
 public class FirefightersEducation extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @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/FirefightersJacket.java

@@ -24,11 +24,12 @@ import java.util.Date;
 @TableName("jc_firefighters_jacket")
 @ApiModel(value="FirefightersJacket对象", description="消防人员配装记录")
 public class FirefightersJacket extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "消防队员")
+	@ApiModelProperty(value = "消防队员")
     private Long firefightersId;
 
     @ApiModelProperty(value = "装备id")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_post")
 @ApiModel(value="FirefightersPost对象", description="岗位信息")
 public class FirefightersPost extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-  
-
-
-    @ApiModelProperty(value = "人员id")
+	@ApiModelProperty(value = "人员id")
     private Long firefightersId;
 
     @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/FirefightersThought.java

@@ -24,11 +24,11 @@ import java.util.Date;
 @TableName("cb_firefighters_thought")
 @ApiModel(value="FirefightersThought对象", description="消防员思想谈话记录")
 public class FirefightersThought extends BaseEntity {
-
-  
-
-
-    @ApiModelProperty(value = "消防救援人员")
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "消防救援人员")
     private Long firefightersId;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "谈话时间")

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

@@ -23,11 +23,12 @@ import java.util.Date;
 @TableName("cb_firefighters_workexperience")
 @ApiModel(value="FirefightersWorkexperience对象", description="工作经历")
 public class FirefightersWorkexperience extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "参加工作时间")
+	@ApiModelProperty(value = "参加工作时间")
     private Date workingHours;
 
     @ApiModelProperty(value = "参加消防部门工作时间")

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

@@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
-
 /**
 * 机构/部门/人员表
 *
@@ -23,9 +22,13 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsr对象", description="部门信息")
-public class OrgUsr extends BaseEntity implements Serializable {
+public class OrgUsr extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "机构/部门名称")
+	@ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
 
     @ApiModelProperty(value = "机构编码")

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

@@ -18,11 +18,12 @@ import lombok.experimental.Accessors;
 @TableName("cb_org_usr_auth")
 @ApiModel(value="OrgUsrAuth对象", description="")
 public class OrgUsrAuth extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    private String recUserName;
+	private String recUserName;
 
     private String sourceId;
 

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

@@ -22,11 +22,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer")
 @ApiModel(value="PowerTransfer对象", description="力量调派")
 public class PowerTransfer extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "警情id")
+	@ApiModelProperty(value = "警情id")
     private Long alertCalledId;
 
     @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/PowerTransferCompany.java

@@ -21,11 +21,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer_company")
 @ApiModel(value="PowerTransferCompany对象", description="调派单位")
 public class PowerTransferCompany extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    
-
-
-    @ApiModelProperty(value = "调派单据id")
+	@ApiModelProperty(value = "调派单据id")
     private Long powerTransferId;
 
     @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/PowerTransferCompanyResources.java

@@ -21,11 +21,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_power_transfer_company_resources")
 @ApiModel(value="PowerTransferCompanyResources对象", description="调派单位资源")
 public class PowerTransferCompanyResources extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-   
-
-
-    @ApiModelProperty(value = "资源类型")
+	@ApiModelProperty(value = "资源类型")
     private String type;
 
     @ApiModelProperty(value = "资源id")

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

@@ -19,8 +19,12 @@ import lombok.experimental.Accessors;
 @TableName("jc_template")
 @ApiModel(value="Template对象", description="模板表")
 public class Template extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "模板类型code")
+	@ApiModelProperty(value = "模板类型code")
     private String typeCode;
 
     @ApiModelProperty(value = "模板类型")

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

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 
+ * <pre>
+ * 警情状态枚举
+ * </pre>
+ *
+ * @author gwb
+ * @version $Id: AlertStatusEnum.java, v 0.1 2021年6月23日 下午5:11:18 gwb Exp $
+ */
+@Getter
+@AllArgsConstructor
+public enum AlertStatusEnum {
+
+	UNCLOSED("unclosed", "未结案"),
+	CLOSED("closed", "已结案");
+
+    private String code;
+    private String name;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public static AlertStatusEnum getEnum(String code)
+	{
+		for (AlertStatusEnum status : AlertStatusEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+}

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

+package com.yeejoin.amos.boot.module.jcs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 装备操作枚举
+ *
+ * @author DELL
+ */
+@Getter
+@AllArgsConstructor
+public enum EquipTypeEnum {
+
+    /**
+     * 退库,回库
+     */
+    退装("scrap", "退装"),
+    回库("stock",  "回库");
+
+    private String key;
+    private String name;
+
+    public String getKey() {
+        return key;
+    }
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,4 +31,13 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
      * @return
      */
     List<AlertSubmittedExtVo> listReportingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
+
+    /**
+     * 获取融合调度短信内容
+     * @param id id
+     * @return 返回结果
+     */
+    AlertSubmittedSMSVo getSchedulingContent(@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/mapper/PowerTransferMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 
 import java.util.List;
 
@@ -14,4 +15,6 @@ import java.util.List;
  */
 public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
     List<PowerTransferCompanyResourcesVo> getPowerTransferList(Long alertCalledId);
+
+    List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId);
 }

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.baomidou.mybatisplus.extension.service.IService;
+
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
 
 /**
 * 警情接警记录 服务类
@@ -9,6 +13,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 * @author tb
 * @date 2021-06-17
 */
-public interface IAlertCalledService extends IService<AlertCalled> {
+public interface IAlertCalledService {
 
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-
 /**
 * 警情表单 服务类
 *
 * @author tb
 * @date 2021-06-17
 */
-public interface IAlertFormService extends IService<AlertForm> {
+public interface IAlertFormService {
 
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
-
 /**
 * 动态表单类型 服务类
 *
 * @author tb
 * @date 2021-06-17
 */
-public interface IAlertFormTypeService extends IService<AlertFormType> {
+public interface IAlertFormTypeService {
 
 }

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

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

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
-
 /**
 * 报送对象 服务类
 *
 * @author tb
 * @date 2021-06-17
 */
-public interface IAlertSubmittedObjectService extends IService<AlertSubmittedObject> {
+public interface IAlertSubmittedObjectService {
 
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 
 /**
@@ -36,4 +37,6 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> {
      * @return
      */
     Boolean save(AlertSubmittedDto alertSubmittedDto);
+
+    AlertSubmittedSMSVo getSchedulingContent(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.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-
 /**
 * 数据字典 服务类
 *
 * @author tb
 * @date 2021-06-07
 */
-public interface IDataDictionaryService extends IService<DataDictionary> {
-
+public interface IDataDictionaryService {
+	
 }

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

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.baomidou.mybatisplus.extension.service.IService;
-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 com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
+
 /**
-* 消防队伍 服务类
-*
-* @author tb
-* @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);
+ * 消防队伍 服务类
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
+public interface IFireTeamService {
+	
+	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/IFirefightersContactsService.java

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

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

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

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

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

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 
 /**
@@ -9,6 +15,13 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 * @author tb
 * @date 2021-06-07
 */
-public interface IFirefightersJacketService extends IService<FirefightersJacket> {
+public interface IFirefightersJacketService {
+
+    ResponseModel<Page<EquipmentOnCarDto>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size);
+
+    boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos);
+
+    boolean update(String type, FirefightersJacket firefightersJacket);
 
+    ResponseModel<Object> getEquipByStockDetailId(Long stockDetailId);
 }

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

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

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.baomidou.mybatisplus.extension.service.IService;
-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.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
+
 /**
 * 消防队员 服务类
 *
 * @author tb
 * @date 2021-06-07
 */
-public interface IFirefightersService extends IService<Firefighters> {
+public interface IFirefightersService {
 
 	List<Firefighters>getFirefighters(int pageNum,int pageSize,FirefightersListVo par);
 	Map<String, Long>getFirefightersCount(int pageNum,int pageSize,FirefightersListVo par);

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
-
 /**
 * 消防员思想谈话记录 服务类
 *
 * @author tb
 * @date 2021-06-07
 */
-public interface IFirefightersThoughtService extends IService<FirefightersThought> {
+public interface IFirefightersThoughtService {
 
 }

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

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

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

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

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgMenu;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-
 import java.util.Collection;
 import java.util.List;
 
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgMenu;
+
 /**
-* 机构/部门/人员表 服务类
-*
-* @author tb
-* @date 2021-06-18
-*/
-public interface IOrgUsrService extends IService<OrgUsr> {
-    List<OrgMenu> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
-    List<OrgMenu> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy, String NAMEMethodName, String PARENTIDMethodName,String OrgTypeMethodName) throws Exception;
+ * 机构/部门/人员表 服务类
+ *
+ * @author tb
+ * @date 2021-06-18
+ */
+public interface IOrgUsrService {
+	List<OrgMenu> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+
+	List<OrgMenu> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
+			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-
 /**
 * 调派单位资源 服务类
 *
 * @author tb
 * @date 2021-06-17
 */
-public interface IPowerTransferCompanyResourcesService extends IService<PowerTransferCompanyResources> {
+public interface IPowerTransferCompanyResourcesService {
 
 }

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
-
 /**
 * 调派单位 服务类
 *
 * @author tb
 * @date 2021-06-17
 */
-public interface IPowerTransferCompanyService extends IService<PowerTransferCompany> {
+public interface IPowerTransferCompanyService {
 
 }

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

@@ -3,8 +3,11 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
+import java.util.List;
+
 /**
  * 力量调派 服务类
  *
@@ -17,6 +20,8 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
 
     boolean createPowerTransfer(PowerTransferDto powerTransferDto);
 
+    List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId);
+
     /**
      * 获取力量调派资源树
      */

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 
@@ -10,7 +9,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 * @author tb
 * @date 2021-06-17
 */
-public interface ITemplateService extends IService<Template> {
+public interface ITemplateService {
 
     /**
      * 根据模板类型及模板格式类型获取模板信息

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

+package com.yeejoin.amos.boot.module.jcs.api.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 警情报送记录
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "AlertSubmittedSMSVo", description = "融合调度记录短信详情")
+public class AlertSubmittedSMSVo {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "短信记录id")
+    private Long sequenceNbr;
+
+    @ApiModelProperty(value = "电话时间")
+    private Date submissionTime;
+
+    @ApiModelProperty(value = "联系电话")
+    private String userPhone;
+
+    @ApiModelProperty(value = "协调单位")
+    private String companyName;
+
+    @ApiModelProperty(value = "联系人")
+    private String userName;
+
+    @ApiModelProperty(value = "值班员")
+    private String sender;
+
+    @ApiModelProperty(value = "报送内容")
+    private String submissionContent;
+
+    @ApiModelProperty(value = "报送模板")
+    private String submissionTemplate;
+}

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

@@ -15,40 +15,40 @@ public class FormList {
 	 * 数据字典
 	 * 
 	 */
-	@Autowired
-	IDataDictionaryService iDataDictionaryService;
-
-	public List<AlertFormVo> getFormlist(List<AlertForm> list) {
-
-		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
-		// 组装数据
-		for (AlertForm alertFrom : list) {
-			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
-						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
-				listfrom.add(vo);				
-			}else {
-				// 查询数据项
-				Map<String, Object> columnMap = new HashMap<>();
-				columnMap.put("type", alertFrom.getFieldValueCode());
-				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.listByMap(columnMap);
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
-				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
-				listfrom.add(vo);				
-			}
-		}
-
-		return listfrom;
-	}
-
-	public List<AlertListvalue> getdata(Collection<DataDictionary> list) {
-		List<AlertListvalue> listAlertListvalue = new ArrayList<AlertListvalue>();
-		for (DataDictionary dataDictionary : list) {
-
-			listAlertListvalue.add(new AlertListvalue(dataDictionary.getSequenceNbr().toString(),
-					 dataDictionary.getName(),dataDictionary.getCode()));
-		}
-		return listAlertListvalue;
-	}
+//	@Autowired
+//	DataDictionaryServiceImpl iDataDictionaryService;
+
+//	public List<AlertFormVo> getFormlist(List<AlertForm> list) {
+//
+//		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
+//		// 组装数据
+//		for (AlertForm alertFrom : list) {
+//			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
+//				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
+//						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
+//				listfrom.add(vo);				
+//			}else {
+//				// 查询数据项
+//				Map<String, Object> columnMap = new HashMap<>();
+//				columnMap.put("type", alertFrom.getFieldValueCode());
+//				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.listByMap(columnMap);
+//				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
+//				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
+//				listfrom.add(vo);				
+//			}
+//		}
+//
+//		return listfrom;
+//	}
+//
+//	public List<AlertListvalue> getdata(Collection<DataDictionary> list) {
+//		List<AlertListvalue> listAlertListvalue = new ArrayList<AlertListvalue>();
+//		for (DataDictionary dataDictionary : list) {
+//
+//			listAlertListvalue.add(new AlertListvalue(dataDictionary.getSequenceNbr().toString(),
+//					 dataDictionary.getName(),dataDictionary.getCode()));
+//		}
+//		return listAlertListvalue;
+//	}
 
 }

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

@@ -5,37 +5,33 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
+
 /**
-* 调派单位
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 调派单位
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Data
 @Accessors(chain = true)
 @TableName("jc_power_transfer_company")
-@ApiModel(value="PowerTransferCompanyVo", description="调派单位")
-public class PowerTransferCompanyVo{
+@ApiModel(value = "PowerTransferCompanyVo", description = "调派单位")
+public class PowerTransferCompanyVo {
 
     private static final long serialVersionUID = 1L;
 
-
-    @ApiModelProperty(value = "调派单据id")
-    private Long powerTransferId;
-
-    @ApiModelProperty(value = "是否只派发机构")
-    private Boolean isDistributionAgencies;
-
-    @ApiModelProperty(value = " 单位id")
-    private Long companyId;
-
     @ApiModelProperty(value = " 单位名称")
     private String companyName;
 
-    @ApiModelProperty(value = "任务信息")
-    private String taskInformation;
+    @ApiModelProperty(value = "资源类型")
+    private String type;
+
+    @ApiModelProperty(value = "资源数量")
+    private Integer resourcesCount;
 
-    @ApiModelProperty(value = "操作人名称")
-    private String recUserName;
+    @ApiModelProperty(value = "时间")
+    private Date recDate;
 
 }

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

@@ -62,4 +62,19 @@
         </if>
         group by jaso.alert_submitted_id
     </select>
+
+    <select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo">
+        select s.sequence_nbr,
+               submission_time,
+               user_phone,
+               company_name,
+               user_name,
+               s.sender,
+               submission_content,
+               content submission_template
+        from jc_alert_submitted_object o
+                 left join jc_alert_submitted s on o.alert_submitted_id = s.sequence_nbr
+                 left join jc_template t on s.business_type = t.type
+        where o.sequence_nbr = ${id}
+    </select>
 </mapper>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper">
     <select id="getPowerTransferList"
             resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo">
-        select sequence_nbr,company_name, type, resources_num
+        select sequence_nbr, company_name, type, resources_num
         from (
                  select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
                  from jc_power_transfer_company ptc
@@ -21,4 +21,18 @@
              ) jcpt
         order by rec_date desc
     </select>
+
+    <select id="getLastPowerTransferCompany"
+            resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo">
+        select company_name, type, count(resources_num) resourcesCount, rec_date
+        from (select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
+              from jc_power_transfer_company ptc
+                       left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
+                       right join jc_power_transfer_company_resources ptcr
+                                  on ptcr.power_transfer_company_id = ptc.sequence_nbr
+              where pt.alert_called_id = '63453543'
+                and ptc.is_distribution_agencies = 0) r
+        group by company_name, type, rec_date
+        having rec_date = (select rec_date from jc_power_transfer_company_resources order by rec_date desc limit 1)
+    </select>
 </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

@@ -35,13 +35,14 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
 
 import io.swagger.annotations.Api;
@@ -59,9 +60,9 @@ import io.swagger.annotations.ApiOperation;
 public class AlertCalledController extends BaseController {
 
     @Autowired
-    IAlertCalledService iAlertCalledService;
+    AlertCalledServiceImpl iAlertCalledService;
     @Autowired
-    IAlertFormValueService iAlertFormValueService;
+    AlertFormValueServiceImpl iAlertFormValueService;
     @Autowired
     private ESAlertCalledService eSAlertCalledService;
     @Autowired
@@ -203,17 +204,32 @@ public class AlertCalledController extends BaseController {
      * @return
      * @throws Exception
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "相似警情分页查询")
     @RequestMapping(value = "/page/similar", method = RequestMethod.POST)
     public ResponseModel<Page<ESAlertCalledDto>> pageBySimilar(
-    		@RequestBody AlertCalledVo alertCalledVo,
+    		@RequestBody ESAlertCalledRequestDto alertCalledVo,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size) throws Exception {
         return ResponseHelper.buildResponse(eSAlertCalledService.queryByKeys(alertCalledVo, current, size));
     }
 
     /**
+     * 
+     * <pre>
+     * 初始化ES
+     * </pre>
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "初始化ES")
+    @RequestMapping(value = "/es/init", method = RequestMethod.PUT)
+    public ResponseModel<Boolean> initEs() {
+        return ResponseHelper.buildResponse(eSAlertCalledService.initEs());
+    }
+    
+    /**
      * 列表无分页查询
      *
      * @return
@@ -274,6 +290,9 @@ public class AlertCalledController extends BaseController {
                     } else if (type.equals(Boolean.class)) {
                         Boolean fileValue = (Boolean) field.get(alertCalled);
                         queryWrapper.eq(name, fileValue);
+                    }else if (type.equals(Long.class)) {
+                    	Long fileValue = (Long) field.get(alertCalled);
+                        queryWrapper.eq(name, fileValue);
                     }
                 }
             } catch (Exception e) {

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,24 +28,11 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormList;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 
 /**
@@ -41,9 +47,8 @@ import java.util.List;
 public class AlertFormController extends BaseController {
 
     @Autowired
-    IAlertFormService iAlertFormService;
-    @Autowired
-    FormList FormList;
+    AlertFormServiceImpl iAlertFormService;
+
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")
@@ -117,11 +122,7 @@ public class AlertFormController extends BaseController {
              Object obj= redisUtils.get(RedisKey.FORM_CODE+code);
              return ResponseHelper.buildResponse(obj);
          }else{
-             QueryWrapper<AlertForm> queryWrapper = new QueryWrapper<>();
-             queryWrapper.eq("alert_type_code", code);
-             //警情动态表单数据
-             List<AlertForm>  alertFormValue = iAlertFormService.list(queryWrapper);
-             list=  FormList.getFormlist(alertFormValue);
+             list=  iAlertFormService.getFormlist(code);
              redisUtils.set(RedisKey.FORM_CODE+code,JSON.toJSON(list),time);
              return ResponseHelper.buildResponse(list);
          }

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormTypeService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormTypeServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**
@@ -31,7 +38,7 @@ import java.util.Arrays;
 public class AlertFormTypeController extends BaseController {
 
     @Autowired
-    IAlertFormTypeService iAlertFormTypeService;
+    AlertFormTypeServiceImpl iAlertFormTypeService;
 
     /**
     * 新增动态表单类型

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**
@@ -31,7 +38,7 @@ import java.util.Arrays;
 public class AlertFormValueController extends BaseController {
 
     @Autowired
-    IAlertFormValueService iAlertFormValueService;
+    AlertFormValueServiceImpl iAlertFormValueService;
 
     /**
     * 新增

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedObjectServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**
@@ -31,7 +38,7 @@ import java.util.Arrays;
 public class AlertSubmittedObjectController extends BaseController {
 
     @Autowired
-    IAlertSubmittedObjectService iAlertSubmittedObjectService;
+    AlertSubmittedObjectServiceImpl iAlertSubmittedObjectService;
 
     /**
     * 新增报送对象

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 com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.*;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 
 /**
@@ -37,7 +48,7 @@ import java.util.List;
 public class DataDictionaryController extends BaseController {
 
     @Autowired
-    IDataDictionaryService iDataDictionaryService;
+    DataDictionaryServiceImpl iDataDictionaryService;
     @Autowired
     RedisUtils redisUtils;
 

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 java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireExpertsServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
 
 
 /**
@@ -31,7 +38,7 @@ import java.util.Arrays;
 public class FireExpertsController extends BaseController {
 
     @Autowired
-    IFireExpertsService iFireExpertsService;
+    FireExpertsServiceImpl iFireExpertsService;
 
     /**
     * 新增

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,21 +29,12 @@ import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-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.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
 
 
 /**
@@ -38,7 +49,7 @@ import java.util.*;
 public class FireTeamController extends BaseController {
 
     @Autowired
-    IFireTeamService iFireTeamService;
+    FireTeamServiceImpl iFireTeamService;
 
     /**
      * 新增消防队伍