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

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/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/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

 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.SchedulingReportingVo;
 
 /**
@@ -11,7 +9,7 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 * @author tb
 * @date 2021-06-17
 */
-public interface IAlertSubmittedService extends IService<AlertSubmitted> {
+public interface IAlertSubmittedService {
 
     /**
      * 根据参数查询融合调度记录

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 java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
 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 org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.List;
 
 /**
 * 消防人员配装记录 服务类
@@ -15,7 +15,7 @@ import java.util.List;
 * @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);
 

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

 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.PowerTransferVo;
 
 /**
@@ -11,7 +9,7 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
  * @author tb
  * @date 2021-06-17
  */
-public interface IPowerTransferService extends IService<PowerTransfer> {
+public interface IPowerTransferService {
 
     PowerTransferVo getPowerTransferList(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/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-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -37,11 +37,11 @@ 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.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 +59,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

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

@@ -32,12 +32,12 @@ 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.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.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -55,13 +55,13 @@ import io.swagger.annotations.ApiOperation;
 public class AlertSubmittedController extends BaseController {
 
     @Autowired
-    IAlertSubmittedService iAlertSubmittedService;
+    AlertSubmittedServiceImpl iAlertSubmittedService;
 
     @Autowired
-    ITemplateService iTemplateService;
+    TemplateServiceImpl iTemplateService;
 
     @Autowired
-    IAlertCalledService iAlertCalledService;
+    AlertCalledServiceImpl iAlertCalledService;
 
     /**
      * 新增警情报送记录

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 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.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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,24 +28,11 @@ 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.api.service.IFirefightersJacketService;
+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;
-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.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;
 
 /**
  * 消防人员配装记录
@@ -39,7 +46,7 @@ import java.util.List;
 public class FirefightersJacketController extends BaseController {
 
 	@Autowired
-    IFirefightersJacketService iFirefightersJacketService;
+	FirefightersJacketServiceImpl iFirefightersJacketService;
 
     /**
      * 新增消防人员配装记录

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 iPowerTransferCompanyService;
 
     /**
      * 新增调派单位

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 iPowerTransferCompanyResourcesService;
 
     /**
      * 新增调派单位资源

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 iPowerTransferService;
 
 
     /**

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

@@ -32,6 +32,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
 
     @Autowired
     IAlertSubmittedObjectService iAlertSubmittedObjectService;
+    @Autowired
+    AlertSubmittedObjectServiceImpl alertSubmittedObjectServiceImpl;
 
     @Override
     public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
@@ -106,8 +108,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
             });
         }
 
-        iAlertSubmittedObjectService.saveBatch(alertSubmittedObjectList);
-
+        alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
         // 3.发送任务消息
         // 调用平台短信发送接口发送消息
         return true;

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

@@ -24,7 +24,6 @@ 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.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.biz.dao.ESAlertCalledRepository;
 
@@ -47,7 +46,7 @@ public class ESAlertCalledService {
     private ESAlertCalledRepository esAlertCalledRepository;
     
 	@Autowired
-	private IAlertCalledService iAlertCalledService;
+	private AlertCalledServiceImpl iAlertCalledService;
 
 	
 	@PostConstruct

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

@@ -35,19 +35,19 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
     PowerTransferMapper powerTransferMapper;
 
     @Autowired
-    IAlertCalledService iAlertCalledService;
+    AlertCalledServiceImpl iAlertCalledService;
 
     @Autowired
-    IPowerTransferCompanyService iPowerTransferCompanyService;
+    PowerTransferCompanyServiceImpl iPowerTransferCompanyService;
 
     @Autowired
-    IPowerTransferCompanyResourcesService iPowerTransferCompanyResourcesService;
+    PowerTransferCompanyResourcesServiceImpl iPowerTransferCompanyResourcesService;
 
     @Autowired
-    ITemplateService iTemplateService;
+    TemplateServiceImpl iTemplateService;
 
     @Autowired
-    IAlertFormValueService iAlertFormValueService;
+    AlertFormValueServiceImpl iAlertFormValueService;
 
     public PowerTransferVo getPowerTransferList(Long alertCalledId) {
         List<PowerTransferCompanyResourcesVo> powerTransferList =