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,16 +7,23 @@ 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 {
 
 
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	@ApiModelProperty(value = "部门名称")
     private String bizOrgName;
 

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,16 +7,23 @@ 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 {
 
 
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	@ApiModelProperty(value = "人员名称")
     private String bizOrgName;
 

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

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

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,9 +19,10 @@ 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")
     private String alertTypeCode;

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

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,9 +21,10 @@ 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")
     private Long alertCalledId;

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,9 +19,10 @@ 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")
     private Long alertSubmittedId;

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,6 +19,11 @@ import lombok.experimental.Accessors;
 @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;
 

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,9 +23,10 @@ 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 = "姓名")
     private String name;

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

@@ -23,9 +23,10 @@ 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 = "消防队伍图片")
     private String img;

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

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

@@ -23,9 +23,10 @@ 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")
     private Long firefightersId;

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,9 +24,10 @@ 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 = "合同名称")
     private String name;

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

@@ -23,9 +23,10 @@ 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")
     private Long firefightersId;

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,9 +24,10 @@ 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 = "消防队员")
     private Long firefightersId;

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,9 +23,10 @@ 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")
     private Long firefightersId;

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

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,9 +23,10 @@ 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 = "参加工作时间")
     private Date workingHours;

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,7 +22,11 @@ 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 = "机构/部门名称")
     private String bizOrgName;

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,9 +18,10 @@ 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;
 

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,9 +22,10 @@ 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")
     private Long alertCalledId;

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,9 +21,10 @@ 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")
     private Long powerTransferId;

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,9 +21,10 @@ 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 = "资源类型")
     private String type;

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,6 +19,10 @@ 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")
     private String typeCode;

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/AlertSubmittedController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-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.BeanUtils;
-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.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.dto.AlertSubmittedDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
-import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
-
+import com.yeejoin.amos.boot.module.jcs.api.vo.*;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+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 javax.ws.rs.HEAD;
+import java.lang.reflect.Field;
+import java.util.*;
 
 
 /**
@@ -55,24 +39,33 @@ import io.swagger.annotations.ApiOperation;
 public class AlertSubmittedController extends BaseController {
 
     @Autowired
-    IAlertSubmittedService iAlertSubmittedService;
+    AlertSubmittedServiceImpl alertSubmittedService;
+
+    @Autowired
+    TemplateServiceImpl templateService;
 
     @Autowired
-    ITemplateService iTemplateService;
+    AlertCalledServiceImpl alertCalledService;
 
     @Autowired
-    IAlertCalledService iAlertCalledService;
+    DataDictionaryServiceImpl dataDictionaryService;
+
+    @Autowired
+    PowerTransferServiceImpl powerTransferService;
 
     /**
      * 新增警情报送记录
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
-    public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmittedDto alertSubmittedDto) {
-        return ResponseHelper.buildResponse(iAlertSubmittedService.save(alertSubmittedDto));
+
+    public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request,
+                                                    @RequestBody AlertSubmittedDto alertSubmittedDto) {
+        return ResponseHelper.buildResponse(alertSubmittedService.save(alertSubmittedDto));
+
     }
 
     /**
@@ -81,11 +74,14 @@ public class AlertSubmittedController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id){
-        return ResponseHelper.buildResponse(iAlertSubmittedService.removeById(id));
+
+    public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id) {
+        return ResponseHelper.buildResponse(alertSubmittedService.removeById(id));
+
+
     }
 
     /**
@@ -93,11 +89,15 @@ public class AlertSubmittedController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
-    public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
-        return ResponseHelper.buildResponse(iAlertSubmittedService.updateById(alertSubmitted));
+
+    public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request,
+                                                           @RequestBody AlertSubmitted alertSubmitted) {
+        return ResponseHelper.buildResponse(alertSubmittedService.updateById(alertSubmitted));
+
+
     }
 
     /**
@@ -106,26 +106,28 @@ public class AlertSubmittedController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id){
-        return ResponseHelper.buildResponse(iAlertSubmittedService.getById(id));
+    public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id) {
+        return ResponseHelper.buildResponse(alertSubmittedService.getById(id));
+
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/scheduling/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表")
     public ResponseModel<SchedulingReportingVo> listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
-        return ResponseHelper.buildResponse(iAlertSubmittedService.listSchedulingByParam(queryParam));
+        return ResponseHelper.buildResponse(alertSubmittedService.listSchedulingByParam(queryParam));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
+
     public ResponseModel<SchedulingReportingVo> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
         queryParam.setSubmissionMethodCode(SubmissionMethodEnum.PHONE.getCode());
-        return ResponseHelper.buildResponse(iAlertSubmittedService.listReportingByParam(queryParam));
+        return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam));
     }
 
     /**
@@ -133,10 +135,11 @@ public class AlertSubmittedController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) {
+
         Page<AlertSubmitted> pageBean;
         QueryWrapper<AlertSubmitted> alertSubmittedQueryWrapper = new QueryWrapper<>();
         Class<? extends AlertSubmitted> aClass = alertSubmitted.getClass();
@@ -174,80 +177,44 @@ public class AlertSubmittedController extends BaseController {
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        page = iAlertSubmittedService.page(pageBean, alertSubmittedQueryWrapper);
+        page = alertSubmittedService.page(pageBean, alertSubmittedQueryWrapper);
         return page;
     }
 
     /**
      * 获取警情续报内容
      *
-     * @param alertCalledId
-     * @return
+     * @param alertCalledId 警情id
+     * @return 返回结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{alertCalledId}/alert_submitted", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取警情续报内容", notes = "获取警情续报内容")
+    @ApiOperation(httpMethod = "GET", value = "获取警情续报内容和模板", notes = "获取警情续报内容和模板")
     public ResponseModel<Object> getAlertSubmittedContent(@PathVariable Long alertCalledId) {
         ArrayList<TemplateVo> templateVos = new ArrayList<>();
         try {
             // 获取警情详情
             String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
-            AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
-            Map<String, Object> map = objectToMap(alertCalled);
-            map.put("companyName", companyName);
-
-            // 获取模板内容
-            // 警情续报
-            Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "alert_submitted"));
-            TemplateVo templateVo = new TemplateVo();
-            BeanUtils.copyProperties(template, templateVo);
-            templateVo.setData(map);
-            templateVos.add(templateVo);
-            // 非警情确认
-            template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "not_alert"));
-            templateVo = new TemplateVo();
-            BeanUtils.copyProperties(template, templateVo);
-            templateVo.setData(map);
-            templateVos.add(templateVo);
-            // 警情结案
-            template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "alert_close"));
-            templateVo = new TemplateVo();
-            BeanUtils.copyProperties(template, templateVo);
-            templateVo.setData(map);
-            templateVos.add(templateVo);
+            alertSubmittedService.getAlertSubmittedContent(alertCalledId, templateVos, companyName);
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            throw  new RuntimeException("系统异常");
         }
         return ResponseHelper.buildResponse(templateVos);
     }
 
     /**
-     * 将Object对象里面的属性和值转化成Map对象
+     * 获取融合调度短信内容
      *
-     * @param obj
-     * @return
-     * @throws IllegalAccessException
+     * @param id id
+     * @return 返回结果
      */
-    @SuppressWarnings("unchecked")
-	public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
-        Map<String, Object> map = new HashMap<>();
-        Class<?> clazz = obj.getClass();
-        Field[] fields = clazz.getDeclaredFields();
-
-        for (Field field : fields) {
-            field.setAccessible(true);
-            String fieldName = field.getName();
-            if ("dynamicFormAlert".equalsIgnoreCase(fieldName)) {
-                List<FormValue> dynamicFormAlert = (List<FormValue>) field.get(obj);
-                for (FormValue formValue : dynamicFormAlert) {
-                    map.put(formValue.getLabel(), formValue.getValue());
-                }
-            } else {
-                Object value = field.get(obj);
-                map.put(fieldName, value);
-            }
-        }
-        return map;
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
+    public ResponseModel<AlertSubmittedSMSVo> getSchedulingContent(@PathVariable Long id) {
+        // 获取报送内容
+        AlertSubmittedSMSVo schedulingContent = alertSubmittedService.getSchedulingContent(id);
+        return ResponseHelper.buildResponse(schedulingContent);
     }
 }
 

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;
 
     /**
      * 新增消防队伍

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

 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.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
+
 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 FirefightersContactsController extends BaseController {
 
     @Autowired
-    IFirefightersContactsService iFirefightersContactsService;
+    FirefightersContactsServiceImpl iFirefightersContactsService;
 
     /**
     * 新增l联系人

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.Date;
+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.conditions.update.UpdateWrapper;
@@ -10,22 +29,10 @@ 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.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
+
 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.Arrays;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -40,7 +47,7 @@ import java.util.List;
 public class FirefightersContractController extends BaseController {
 
     @Autowired
-    IFirefightersContractService iFirefightersContractService;
+    FirefightersContractServiceImpl iFirefightersContractService;
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+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.conditions.update.UpdateWrapper;
@@ -9,26 +29,25 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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.*;
-import 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.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-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.Arrays;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -43,19 +62,19 @@ import java.util.Map;
 public class FirefightersController extends BaseController {
 
     @Autowired
-    IFirefightersService iFirefightersService;
+    FirefightersServiceImpl iFirefightersService;
     @Autowired
-    IFirefightersPostService iFirefightersPostService;
+    FirefightersPostServiceImpl iFirefightersPostService;
     @Autowired
-    IFirefightersContactsService ifirefightersContactsService;
+    FirefightersContactsServiceImpl ifirefightersContactsService;
     @Autowired
-    IFirefightersEducationService ifirefightersEducationService;
+    FirefightersEducationServiceImpl ifirefightersEducationService;
     @Autowired
-    IFirefightersThoughtService iFirefightersThoughtService;
+    FirefightersThoughtServiceImpl iFirefightersThoughtService;
     @Autowired
-    IFirefightersContractService iFirefightersContractService;
+    FirefightersContractServiceImpl iFirefightersContractService;
     @Autowired
-    IFirefightersJacketService iFirefightersJacketService;
+    FirefightersJacketServiceImpl iFirefightersJacketService;
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")

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

 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.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+
 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 FirefightersEducationController extends BaseController {
 
     @Autowired
-    IFirefightersEducationService iFirefightersEducationService;
+    FirefightersEducationServiceImpl iFirefightersEducationService;
 
     /**
     * 新增人员学历

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-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.FirefightersJacket;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import java.util.Arrays;
+import java.util.Date;
+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.transaction.annotation.Transactional;
-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.exception.instance.BadRequest;
 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.Date;
-import java.util.List;
+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.dto.EquipSpecificDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 /**
  * 消防人员配装记录
@@ -36,7 +46,7 @@ import java.util.List;
 public class FirefightersJacketController extends BaseController {
 
 	@Autowired
-	IFirefightersJacketService iFirefightersJacketService;
+	FirefightersJacketServiceImpl iFirefightersJacketService;
 
     /**
      * 新增消防人员配装记录
@@ -44,26 +54,31 @@ public class FirefightersJacketController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/save/{firefightersId}", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防人员配装记录", notes = "新增消防人员配装记录")
     @Transactional
-	public ResponseModel<Object> saveFirefightersJacket(HttpServletRequest request,
-			@RequestBody List<FirefightersJacket> firefightersJacket) {			
-		iFirefightersJacketService.saveOrUpdateBatch(firefightersJacket);
+    public ResponseModel<Object> saveFirefightersJacket(@ApiParam(value = "消防队员ID", required = true) @PathVariable Long firefightersId, @RequestBody List<EquipmentOnCarDto> equipmentOnCarDtos) {
+        boolean flag = iFirefightersJacketService.saveOrUpdateBatch(firefightersId, equipmentOnCarDtos);
+        if (!flag) {
+            throw new BadRequest("保存失败.");
+        }
         return ResponseHelper.buildResponse(null);
     }
 
     /**
-	 * 根据id删除
+     * 删除数据(退装|回库)
      *
-	 * @param id
+     * @param
      * @return
      */
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-	public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
-	iFirefightersJacketService.update(new UpdateWrapper<FirefightersJacket>().eq("sequence_nbr", id).set("is_delete", 1));     
+    @RequestMapping(value = "/{type}", method = RequestMethod.DELETE)
+    @ApiOperation(httpMethod = "DELETE", value = "删除数据", notes = "删除数据")
+    public ResponseModel<Object> deleteById(@PathVariable String type, @RequestBody FirefightersJacket firefightersJacket) {
+        boolean flag = iFirefightersJacketService.update(type, firefightersJacket);
+        if (!flag) {
+            throw new BadRequest("删除失败.");
+        }
         return ResponseHelper.buildResponse(null);
     }
 
@@ -109,6 +124,7 @@ public class FirefightersJacketController extends BaseController {
 
         Page<FirefightersJacket> pageBean;
         QueryWrapper<FirefightersJacket> firefightersJacketQueryWrapper = new QueryWrapper<>();
+        firefightersJacketQueryWrapper.eq("is_delete", 0);
         Class<? extends FirefightersJacket> aClass = firefightersJacket.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
             try {
@@ -129,7 +145,7 @@ public class FirefightersJacketController extends BaseController {
                     } else if (type.equals(Date.class)) {
                         Date fileValue = (Date) field.get(firefightersJacket);
                         firefightersJacketQueryWrapper.eq(name, fileValue);
-                    }else {
+                    } else {
                         String fileValue = (String) field.get(firefightersJacket);
                         firefightersJacketQueryWrapper.eq(name, fileValue);
                     }
@@ -147,6 +163,26 @@ public class FirefightersJacketController extends BaseController {
         page = iFirefightersJacketService.page(pageBean, firefightersJacketQueryWrapper);
 
         return ResponseHelper.buildResponse(page);
+    }
 
+    /**
+     * 分页查询设备列表（调用装备接口）
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "人员装备列表")
+    @RequestMapping(value = "/airEquipSpecificPage", method = RequestMethod.GET)
+    public ResponseModel<Page<EquipmentOnCarDto>> getAirEquipSpecificPage(int current, int size,
+                                                                          EquipSpecificDto equipSpecificDto) throws Exception {
+        return iFirefightersJacketService.getAirEquipSpecificPage(equipSpecificDto, current, size);
+    }
+
+    /**
+     * 查询设备详情（调用装备接口）
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "人员装备详情")
+    @RequestMapping(value = "/getEquipByStockDetailId/{stockDetailId}", method = RequestMethod.GET)
+    public ResponseModel<Object> getEquipByStockDetailId(@PathVariable Long stockDetailId) throws Exception {
+        return iFirefightersJacketService.getEquipByStockDetailId(stockDetailId);
     }
 }

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

 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.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+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.conditions.update.UpdateWrapper;
@@ -12,25 +30,14 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 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;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersData;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+
 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.transaction.annotation.Transactional;
-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.Arrays;
 
 
 /**
@@ -45,13 +52,13 @@ import java.util.Arrays;
 public class FirefightersPostController extends BaseController {
 
     @Autowired
-    IFirefightersPostService iFirefightersPostService;
+    FirefightersPostServiceImpl iFirefightersPostService;
     @Autowired
-    IFirefightersContactsService ifirefightersContactsService;
+    FirefightersContactsServiceImpl ifirefightersContactsService;
     @Autowired
-    IFirefightersEducationService ifirefightersEducationService;
+    FirefightersEducationServiceImpl ifirefightersEducationService;
     @Autowired
-    IFirefightersWorkexperienceService ifirefightersWorkexperienceService;
+    FirefightersWorkexperienceServiceImpl ifirefightersWorkexperienceService;
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+import java.util.Date;
+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.conditions.update.UpdateWrapper;
@@ -10,22 +29,10 @@ 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.FirefightersThought;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
+
 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.Arrays;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -40,7 +47,7 @@ import java.util.List;
 public class FirefightersThoughtController extends BaseController {
 
     @Autowired
-    IFirefightersThoughtService iFirefightersThoughtService;
+    FirefightersThoughtServiceImpl iFirefightersThoughtService;
     @Autowired
     RedisUtils redisUtils;
     @Value("${redis.cache.failure.time}")

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

 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.FirefightersWorkexperience;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
+
 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 FirefightersWorkexperienceController extends BaseController {
 
     @Autowired
-    IFirefightersWorkexperienceService iFirefightersWorkexperienceService;
+    FirefightersWorkexperienceServiceImpl iFirefightersWorkexperienceService;
 
     /**
     * 新增工作经历

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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;
@@ -10,27 +35,15 @@ 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.entity.OrgMenu;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+
 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 javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * @author fengwang
@@ -41,9 +54,9 @@ import java.util.*;
 @RequestMapping(value = "/jcs/org-department")
 public class OrgDepartmentController {
     @Autowired
-    IOrgUsrService iOrgUsrService;
+    OrgUsrServiceImpl iOrgUsrService;
     @Autowired
-    IAlertFormValueService iAlertFromValueService;
+    AlertFormValueServiceImpl iAlertFromValueService;
 
     /**
      * 新增部门信息

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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,27 +34,15 @@ import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 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.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+
 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 javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * @author fengwang
@@ -40,9 +53,9 @@ import java.util.*;
 @RequestMapping(value = "/org-person")
 public class OrgPersonController {
     @Autowired
-    IOrgUsrService iOrgUsrService;
+    OrgUsrServiceImpl iOrgUsrService;
     @Autowired
-    IAlertFormValueService iAlertFromValueService;
+    AlertFormValueServiceImpl iAlertFromValueService;
 
     /**
      * 新增人员信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrAuthController.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.OrgUsrAuth;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrAuthService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrAuthServiceImpl;
+
 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 OrgUsrAuthController extends BaseController {
 
     @Autowired
-    IOrgUsrAuthService iOrgUsrAuthService;
+    OrgUsrAuthServiceImpl iOrgUsrAuthService;
 
     /**
     * 新增

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+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;
@@ -11,28 +36,15 @@ 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.entity.OrgMenu;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-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 javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 
 /**
@@ -47,9 +59,9 @@ import java.util.*;
 public class OrgUsrController extends BaseController {
 
     @Autowired
-    IOrgUsrService iOrgUsrService;
+    OrgUsrServiceImpl iOrgUsrService;
     @Autowired
-    IAlertFormValueService iAlertFromValueService;
+    AlertFormValueServiceImpl iAlertFromValueService;
 
     /**
      * 新增单位信息

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+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.PowerTransferCompany;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferCompanyServiceImpl;
+
 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 java.util.Arrays;
 
 
 /**
@@ -30,7 +36,7 @@ import java.util.Arrays;
 public class PowerTransferCompanyController extends BaseController {
 
     @Autowired
-    IPowerTransferCompanyService iPowerTransferCompanyService;
+    PowerTransferCompanyServiceImpl powerTransferCompanyService;
 
     /**
      * 新增调派单位
@@ -41,7 +47,7 @@ public class PowerTransferCompanyController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增调派单位", notes = "新增调派单位")
     public boolean savePowerTransferCompany(@RequestBody PowerTransferCompany powerTransferCompany) {
-        return iPowerTransferCompanyService.save(powerTransferCompany);
+        return powerTransferCompanyService.save(powerTransferCompany);
     }
 
     /**
@@ -54,7 +60,7 @@ public class PowerTransferCompanyController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(@PathVariable Long id) {
-        return iPowerTransferCompanyService.removeById(id);
+        return powerTransferCompanyService.removeById(id);
     }
 
 
@@ -67,7 +73,7 @@ public class PowerTransferCompanyController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改调派单位", notes = "修改调派单位")
     public boolean updateByIdPowerTransferCompany(@RequestBody PowerTransferCompany powerTransferCompany) {
-        return iPowerTransferCompanyService.updateById(powerTransferCompany);
+        return powerTransferCompanyService.updateById(powerTransferCompany);
     }
 
 
@@ -81,7 +87,7 @@ public class PowerTransferCompanyController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public PowerTransferCompany selectById(@PathVariable Long id) {
-        return iPowerTransferCompanyService.getById(id);
+        return powerTransferCompanyService.getById(id);
     }
 
 
@@ -130,7 +136,7 @@ public class PowerTransferCompanyController extends BaseController {
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        page = iPowerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper);
+        page = powerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper);
         return page;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+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.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferCompanyResourcesServiceImpl;
+
 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 java.util.Arrays;
 
 
 /**
@@ -30,7 +36,7 @@ import java.util.Arrays;
 public class PowerTransferCompanyResourcesController extends BaseController {
 
     @Autowired
-    IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
+    PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
 
     /**
      * 新增调派单位资源
@@ -41,7 +47,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增调派单位资源", notes = "新增调派单位资源")
     public boolean savePowerTransferCompanyResources(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
-        return iPowerTransferCompanyResourcesService.save(powerTransferCompanyResources);
+        return powerTransferCompanyResourcesService.save(powerTransferCompanyResources);
     }
 
     /**
@@ -54,7 +60,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(@PathVariable Long id) {
-        return iPowerTransferCompanyResourcesService.removeById(id);
+        return powerTransferCompanyResourcesService.removeById(id);
     }
 
 
@@ -67,7 +73,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改调派单位资源", notes = "修改调派单位资源")
     public boolean updateByIdPowerTransferCompanyResources(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
-        return iPowerTransferCompanyResourcesService.updateById(powerTransferCompanyResources);
+        return powerTransferCompanyResourcesService.updateById(powerTransferCompanyResources);
     }
 
 
@@ -81,7 +87,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public PowerTransferCompanyResources selectById(@PathVariable Long id) {
-        return iPowerTransferCompanyResourcesService.getById(id);
+        return powerTransferCompanyResourcesService.getById(id);
     }
 
 
@@ -130,7 +136,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        page = iPowerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper);
+        page = powerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper);
         return page;
     }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import java.util.Arrays;
+
+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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,20 +21,12 @@ 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.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 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 java.util.Arrays;
 
 /**
  * 力量调派
@@ -34,7 +40,7 @@ import java.util.Arrays;
 public class PowerTransferController extends BaseController {
 
     @Autowired
-    IPowerTransferService iPowerTransferService;
+    PowerTransferServiceImpl powerTransferService;
 
 
     /**
@@ -46,7 +52,7 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派")
     public boolean savePowerTransfer(@RequestBody PowerTransfer powerTransfer) {
-        return iPowerTransferService.save(powerTransfer);
+        return powerTransferService.save(powerTransfer);
     }
 
     /**
@@ -59,7 +65,7 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public boolean deleteById(@PathVariable Long id) {
-        return iPowerTransferService.removeById(id);
+        return powerTransferService.removeById(id);
     }
 
 
@@ -72,7 +78,7 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改力量调派", notes = "修改力量调派")
     public boolean updateByIdPowerTransfer(@RequestBody PowerTransfer powerTransfer) {
-        return iPowerTransferService.updateById(powerTransfer);
+        return powerTransferService.updateById(powerTransfer);
     }
 
 
@@ -86,7 +92,7 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public PowerTransfer selectById(@PathVariable Long id) {
-        return iPowerTransferService.getById(id);
+        return powerTransferService.getById(id);
     }
 
     /**
@@ -133,7 +139,7 @@ public class PowerTransferController extends BaseController {
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        page = iPowerTransferService.page(pageBean, powerTransferQueryWrapper);
+        page = powerTransferService.page(pageBean, powerTransferQueryWrapper);
         return page;
     }
 
@@ -146,7 +152,7 @@ public class PowerTransferController extends BaseController {
     @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
     public ResponseModel<PowerTransferVo> list(@PathVariable String alert_called_id) {
-        PowerTransferVo powerTransferVo = iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
+        PowerTransferVo powerTransferVo = powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
         return ResponseHelper.buildResponse(powerTransferVo);
     }
 
@@ -158,7 +164,7 @@ public class PowerTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "力量调派-任务派发", notes = "力量调派-任务派发")
-    public ResponseModel<Object> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
+    public ResponseModel<Boolean> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
         AgencyUserModel userInfo = getUserInfo();
         powerTransferDto.setTaskSenderId(Long.parseLong(userInfo.getUserId()));
         powerTransferDto.setTaskSenderName(userInfo.getUserName());
@@ -166,7 +172,7 @@ public class PowerTransferController extends BaseController {
         String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
         powerTransferDto.setCompanyName(companyName);
 
-        boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
+        boolean save = powerTransferService.createPowerTransfer(powerTransferDto);
         return ResponseHelper.buildResponse(save);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/TemplateController.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 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.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,19 +23,10 @@ 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.dto.TemplateExtendDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
-import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
+
 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.Arrays;
 
 
 /**
@@ -34,7 +41,7 @@ import java.util.Arrays;
 public class TemplateController extends BaseController {
 
     @Autowired
-    ITemplateService iTemplateService;
+    TemplateServiceImpl iTemplateService;
 
     /**
     * 新增模板表

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
-
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertListvalue;
+import com.yeejoin.amos.boot.module.jcs.api.vo.Items;
 
 /**
 * 警情表单 服务实现类
@@ -16,5 +29,42 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 */
 @Service
 public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,AlertFormMapper> implements IAlertFormService{
+	@Autowired
+	DataDictionaryServiceImpl iDataDictionaryService;
+	
+	public List<AlertFormVo> getFormlist(String code) {
+
+		 QueryWrapper<AlertForm> queryWrapper = new QueryWrapper<>();
+         queryWrapper.eq("alert_type_code", code);
+         List<AlertForm>  alertFormValue = this.list(queryWrapper);
+		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
+		// 组装数据
+		for (AlertForm alertFrom : alertFormValue) {
+			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-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedObjectServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedObjectDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedObjectMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 /**
 * 报送对象 服务实现类
@@ -16,4 +17,5 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class AlertSubmittedObjectServiceImpl extends BaseService<AlertSubmittedObjectDto,AlertSubmittedObject,AlertSubmittedObjectMapper> implements IAlertSubmittedObjectService {
 
+
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 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.entity.AlertSubmittedObject;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSubmitTypeEnum;
@@ -12,6 +12,8 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.*;
+import org.springframework.beans.BeanUtils;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 import org.apache.commons.lang3.ObjectUtils;
@@ -19,9 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -35,6 +38,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
 
     @Autowired
     IAlertSubmittedObjectService iAlertSubmittedObjectService;
+    @Autowired
+    AlertSubmittedObjectServiceImpl alertSubmittedObjectServiceImpl;
+    @Autowired
+    AlertCalledServiceImpl alertCalledService;
+    @Autowired
+    DataDictionaryServiceImpl dataDictionaryService;
+    @Autowired
+    TemplateServiceImpl templateService;
+    @Autowired
+    PowerTransferServiceImpl powerTransferService;
 
     @Override
     public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
@@ -121,10 +134,76 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
             });
         }
 
-        iAlertSubmittedObjectService.saveBatch(alertSubmittedObjectList);
-
+        alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
         // 3.发送任务消息
         // 调用平台短信发送接口发送消息
         return true;
     }
+
+    public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateVo> templateVos, String companyName) throws IllegalAccessException {
+        AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
+        Map<String, Object> map = objectToMap(alertCalled);
+        map.put("companyName", companyName);
+
+        // 获取模板内容
+        List<DataDictionary> dataDictionaries =
+                dataDictionaryService.list(new QueryWrapper<DataDictionary>().eq("type",
+                        "JQBSLX"));
+        for (DataDictionary dataDictionary : dataDictionaries) {
+            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
+                    dataDictionary.getCode()));
+            List<PowerTransferCompanyVo> lastPowerTransferCompany;
+            powerTransferService.getLastPowerTransferCompany(alertCalledId);
+            if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
+                    powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
+                // 获取力量调派内容
+                StringBuilder companyNames = new StringBuilder();
+                StringBuilder resourcesInfo = new StringBuilder();
+                for (PowerTransferCompanyVo powerTransferCompanyVo : lastPowerTransferCompany) {
+                    companyNames.append(powerTransferCompanyVo.getCompanyName()).append("、");
+                    resourcesInfo.append(powerTransferCompanyVo.getType()).append(powerTransferCompanyVo.getResourcesCount()).append("辆、");
+                }
+                map.put("companyNames", companyNames.deleteCharAt(companyNames.length() - 1).toString());
+                map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString());
+            }
+            TemplateVo templateVo = new TemplateVo();
+            BeanUtils.copyProperties(template, templateVo);
+            templateVo.setData(map);
+            templateVos.add(templateVo);
+        }
+    }
+
+    /**
+     * 将Object对象里面的属性和值转化成Map对象
+     *
+     * @param obj 源对象
+     * @return 转化结果
+     * @throws IllegalAccessException IllegalAccessException
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
+        Map<String, Object> map = new HashMap<>();
+        Class<?> clazz = obj.getClass();
+        Field[] fields = clazz.getDeclaredFields();
+
+        for (Field field : fields) {
+            field.setAccessible(true);
+            String fieldName = field.getName();
+            if ("dynamicFormAlert".equalsIgnoreCase(fieldName)) {
+                List<FormValue> dynamicFormAlert = (List<FormValue>) field.get(obj);
+                for (FormValue formValue : dynamicFormAlert) {
+                    map.put(formValue.getLabel(), formValue.getValue());
+                }
+            } else {
+                Object value = field.get(obj);
+                map.put(fieldName, value);
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public AlertSubmittedSMSVo getSchedulingContent(Long id) {
+        return this.baseMapper.getSchedulingContent(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/ESAlertCalledService.java

@@ -22,10 +22,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.ESAlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
+import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
 
 /**
@@ -47,7 +47,8 @@ public class ESAlertCalledService {
     private ESAlertCalledRepository esAlertCalledRepository;
     
 	@Autowired
-	private IAlertCalledService iAlertCalledService;
+	private AlertCalledServiceImpl alertCalledService;
+
 
 	
 	@PostConstruct
@@ -101,10 +102,16 @@ public class ESAlertCalledService {
      * @return
      */
     @SuppressWarnings({ "rawtypes" })
-	public Page<ESAlertCalledDto> queryByKeys(AlertCalledVo alertCalledVo, int current, int size) 
+	public Page<ESAlertCalledDto> queryByKeys(ESAlertCalledRequestDto alertCalledVo, int current, int size) 
     {
     	Page<ESAlertCalledDto> result = new Page<ESAlertCalledDto>(current, size);
     	
+    	String[] alertStatus = alertCalledVo.getAlertStatus();
+    	if (ValidationUtil.isEmpty(alertStatus))
+		{
+    		return result;
+		}
+    	
     	AlertCalled alertCalled = alertCalledVo.getAlertCalled();
     	if (ValidationUtil.isEmpty(alertCalled))
 		{
@@ -114,6 +121,17 @@ public class ESAlertCalledService {
          * 通用匹配规则，条件构建
          */
     	BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+    	//警情状态
+    	BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
+    	for (String status : alertStatus)
+		{
+    		AlertStatusEnum alertStatusEnum = AlertStatusEnum.getEnum(status);
+    		if (!ValidationUtil.isEmpty(alertStatusEnum))
+			{
+    			qb0.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getName()));
+			}
+		}
+    	boolMust.must(qb0);
         //接警时间，距离当前时间不超过半小时的
         long currentTime = System.currentTimeMillis() ;
         currentTime = currentTime - 30*60*1000;
@@ -244,6 +262,13 @@ public class ESAlertCalledService {
     			esAlertCalled.setAddress(alertCalled.getAddress());
     			esAlertCalled.setAlertStage(alertCalled.getAlertStage());
     			esAlertCalled.setAlertStatus(alertCalled.getAlertStatus());
+    			if (alertCalled.getAlertStatus())
+				{
+    				esAlertCalled.setAlertStatusStr(AlertStatusEnum.CLOSED.getCode());
+				}else 
+				{
+					esAlertCalled.setAlertStatusStr(AlertStatusEnum.UNCLOSED.getCode());
+				}
     			esAlertCalled.setResponseLevelCode(alertCalled.getResponseLevelCode());
     			esAlertCalled.setUnitInvolved(alertCalled.getUnitInvolved());
     			esAlertCalled.setCoordinateX(alertCalled.getCoordinateX());
@@ -377,7 +402,7 @@ public class ESAlertCalledService {
         
         wrapper.ge("call_time", date);
         
-        List<AlertCalled> alertCalleds = iAlertCalledService.list(wrapper);
+        List<AlertCalled> alertCalleds = alertCalledService.list(wrapper);
         if (!ValidationUtil.isEmpty(alertCalleds))
 		{
         	saveAlertCalledToES(alertCalleds);

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jcs.api.client.EquipFeignClient;
+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.dto.FirefightersJacketDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.jcs.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersJacketMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
-* 消防人员配装记录 服务实现类
-*
-* @author tb
-* @date 2021-06-07
-*/
+ * 消防人员配装记录 服务实现类
+ *
+ * @author tb
+ * @date 2021-06-07
+ */
 @Service
-public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacketDto,FirefightersJacket,FirefightersJacketMapper> implements IFirefightersJacketService {
+public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacketDto, FirefightersJacket, FirefightersJacketMapper> implements IFirefightersJacketService {
+
+    @Autowired
+    private EquipFeignClient equipFeignClient;
+
+    @Override
+    public ResponseModel<Page<EquipmentOnCarDto>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size) {
+        Page page = new Page(current, size);
+        equipSpecificDto.setPage(page);
+        ResponseModel<Page<EquipmentOnCarDto>> airEquipSpecificPage = equipFeignClient.getAirEquipSpecificPage(equipSpecificDto);
+        return airEquipSpecificPage;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos) {
+        List<Long> ids = equipmentOnCarDtos.stream().map(EquipmentOnCarDto::getStockDetailId).collect(Collectors.toList());
+        List<Object> result = equipFeignClient.stockBindEquip(ids).getResult();
+        if (result.size() > 0) {
+            List<FirefightersJacket> firefightersJackets = new ArrayList<>();
+            equipmentOnCarDtos.forEach(x -> {
+                FirefightersJacket firefightersJacket = new FirefightersJacket();
+                BeanUtils.copyProperties(x, firefightersJacket);
+                firefightersJacket.setEquipmentDetailId(x.getEquipmentSpecificId());
+                firefightersJacket.setEquipmentDetailName(x.getEquipmentSpecificName());
+                firefightersJacket.setEquipmentTypeName(x.getEquipDefinitionName());
+                firefightersJacket.setAllotmentTime(DateUtils.getDateNow());
+                firefightersJacket.setFirefightersId(firefightersId);
+                firefightersJackets.add(firefightersJacket);
+            });
+            saveOrUpdateBatch(firefightersJackets);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean update(String type, FirefightersJacket firefightersJacket) {
+        ResponseModel<Object> objectResponseModel = null;
+        if (EquipTypeEnum.退装.getKey().equals(type)) {
+            objectResponseModel = equipFeignClient.scrapEquip(String.valueOf(firefightersJacket.getStockDetailId()));
+        } else if (EquipTypeEnum.回库.getKey().equals(type)) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("stockDetailId", firefightersJacket.getStockDetailId());
+            objectResponseModel = equipFeignClient.stockEquip(map);
+        }
+        if (ValidationUtil.isEmpty(objectResponseModel)){
+            return false;
+        }
+        update(new UpdateWrapper<FirefightersJacket>().eq("sequence_nbr", firefightersJacket.getSequenceNbr()).set("is_delete", 1));
+        return true;
+    }
 
+    @Override
+    public ResponseModel<Object> getEquipByStockDetailId(Long stockDetailId) {
+        return equipFeignClient.getAirEquipSpecificDetail(stockDetailId);
+    }
 }

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

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
 import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +35,6 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -48,25 +48,22 @@ import java.util.stream.Collectors;
  * @date 2021-06-17
  */
 @Service
-public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,PowerTransfer,PowerTransferMapper> implements IPowerTransferService {
-
-    @Resource
-    PowerTransferMapper powerTransferMapper;
+public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper> implements IPowerTransferService {
 
     @Autowired
-    IAlertCalledService iAlertCalledService;
+    AlertCalledServiceImpl alertCalledService;
 
     @Autowired
-    IPowerTransferCompanyService iPowerTransferCompanyService;
+    PowerTransferCompanyServiceImpl powerTransferCompanyService;
 
     @Autowired
-    IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
+    PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
 
     @Autowired
-    ITemplateService iTemplateService;
+    TemplateServiceImpl templateService;
 
     @Autowired
-    IAlertFormValueService iAlertFormValueService;
+    AlertFormValueServiceImpl alertFormValueService;
 
     @Autowired
     EquipFeignService equipFeignService;
@@ -76,7 +73,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
 
     public PowerTransferVo getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesVo> powerTransferList =
-                powerTransferMapper.getPowerTransferList(alertCalledId);
+                this.baseMapper.getPowerTransferList(alertCalledId);
         PowerTransferVo powerTransferVo = new PowerTransferVo();
         int resourcesCount = powerTransferList.size();
         powerTransferVo.setResourcesCount(resourcesCount);
@@ -93,7 +90,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
         String dispatch_num = alertCalledId.toString() + (count + 1);
 
         // 获取警情详情
-        AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
+        AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
 
         // 创建力量调派
         PowerTransfer powerTransfer = new PowerTransfer();
@@ -106,7 +103,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
         Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
 
         // 获取任务派发模板
-        Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type",
+        Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
                 alertCalled.getAlertType()));
         String content = template.getContent();
         Map<String, String> definitions = new HashMap<>();
@@ -152,7 +149,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
 
     private void initDefinitions(Map<String, String> definitions,
                                  AlertCalled alertCalled, PowerTransferDto powerTransferDto) {
-        List<AlertFormValue> alertFormValue = iAlertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
+        List<AlertFormValue> alertFormValue = alertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
                 "alert_called_id", alertCalled.getSequenceNbr()));
         definitions.put("rescueGrid", alertCalled.getRescueGrid());
         definitions.put("alertType", alertCalled.getAlertType());
@@ -189,7 +186,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
                 definitions.put("type", "");
                 definitions.put("resourcesNum", "");
                 powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
-                iPowerTransferCompanyService.save(powerTransferCompany);
+                powerTransferCompanyService.save(powerTransferCompany);
             } else {
                 powerTransferCompany.setIsDistributionAgencies(false);
                 StringBuilder taskInformation = new StringBuilder();
@@ -201,12 +198,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
                     taskInformation.append(information).append(";");
                 }
                 powerTransferCompany.setTaskInformation(taskInformation.toString());
-                iPowerTransferCompanyService.save(powerTransferCompany);
+                powerTransferCompanyService.save(powerTransferCompany);
                 Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
                 List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
                         DtoEntityBatchConvert(powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
-                iPowerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
+                powerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
+            }
         }
     }
+
+    public List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId) {
+        return this.baseMapper.getLastPowerTransferCompany(alertCalledId);
     }
 }