修改返回值。删除无用引用

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
-import java.io.Serializable;
-
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
+import java.io.Serializable;
+
 /***
  *
  * 用户选择保存实体类

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

@@ -7,7 +7,6 @@ import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.TransactionSystemException;
 import org.springframework.web.bind.annotation.RequestMapping;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
 /**
  * 基础DTO
  * @author kinky

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

 package com.yeejoin.amos.boot.biz.common.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 公共实体类
  *

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/CommonResponseUtil.java

 package com.yeejoin.amos.boot.biz.common.utils;
 
+import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import org.springframework.http.HttpStatus;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-
 /**
  * @author DELL
  */

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -5,13 +5,7 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.FileOutConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.ITypeConvert;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.TemplateConfig;
+import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
 /**
  * 
  * 

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedisConfig.java

@@ -9,7 +9,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/Swagger2Config.java

 package com.yeejoin.amos.boot.biz.config;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import io.swagger.annotations.ApiOperation;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-
-import io.swagger.annotations.ApiOperation;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
 import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 /**

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/config/CorsResponseHeaderFilter.java

 package com.yeejoin.amos.server.gateway.config;
 
-import java.util.ArrayList;
-
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.server.ServerWebExchange;
-
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+
 public class CorsResponseHeaderFilter implements GlobalFilter, Ordered{
 	
 	@Override

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/config/GatewayInfo.java

 package com.yeejoin.amos.server.gateway.config;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
 import org.springframework.cloud.gateway.filter.factory.StripPrefixGatewayFilterFactory;
 import org.springframework.cloud.gateway.route.RouteLocator;

amos-boot-module/amos-boot-cloud-gateway/src/main/java/com/yeejoin/amos/server/gateway/face/service/DynamicRouteServiceImpl.java

@@ -7,7 +7,6 @@ import org.springframework.cloud.gateway.route.RouteDefinitionWriter;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Service;
-
 import reactor.core.publisher.Mono;
 
 /**

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/dto/DemoDto.java

 package com.yeejoin.amos.boot.module.demo.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/entity/Demo.java

 package com.yeejoin.amos.boot.module.demo.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 /**
 * 
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/mapper/DemoMapper.java

 package com.yeejoin.amos.boot.module.demo.api.mapper;
 
-import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/service/IDemoService.java

 package com.yeejoin.amos.boot.module.demo.api.service;
 
-import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-demo-api/src/main/java/com/yeejoin/amos/boot/module/demo/api/vo/DemoVo.java

 package com.yeejoin.amos.boot.module.demo.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 警情接警记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
+
+import java.util.List;
 
 /**
 * 警情报送记录

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防队伍
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * l联系人
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防员合同
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防队员
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 人员学历
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防人员配装记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 岗位信息
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 消防员思想谈话记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 /**
 * 工作经历
 *

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

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

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * 调派单位
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.List;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
 * 力量调派
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 
 import java.util.List;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 /**
  * 警情报送公司对象dto
  * @author DELL

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import lombok.Data;
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 警情接警记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 警情表单
 *

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

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 动态表单类型
 *

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

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 警情报送记录
 *

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

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 报送对象
 *

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

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 数据字典
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import java.util.Date;
-
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * 

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防队伍
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防队员
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * l联系人
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防员合同
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 人员学历
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防人员配装记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 岗位信息
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 消防员思想谈话记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,13 +10,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.Date;
 /**
 * 工作经历
 *

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -3,15 +3,9 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.TableName;
 /**
 * 调派单位
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.TableName;
 /**
 * 调派单位资源
 *

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

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 模板表
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 
 /**
 * 警情接警记录 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 
 /**
 * 警情表单 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 
 /**
 *  Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 
 /**
 * 报送对象 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 
 /**
 * 数据字典 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 
 /**
 *  Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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 org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Select;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
 * 消防队伍 Mapper 接口
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 
 /**
 * l联系人 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 
 /**
 * 消防员合同 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 
 /**
 * 人员学历 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 
 /**
 * 消防人员配装记录 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
-
-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
 
 /**
 * 消防队员 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 
 /**
 * 岗位信息 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 
 /**
 * 消防员思想谈话记录 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 
 /**
 * 工作经历 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 
 /**
 *  Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 
 /**
 * 机构/部门/人员表 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 
 /**
 * 调派单位 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
 /**
 * 调派单位资源 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
 import java.util.List;
 

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 
 /**
 * 模板表 Mapper 接口

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 
 /**
 * 警情接警记录 服务类

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.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 
 /**
 * 警情表单 服务类

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.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 
 /**
 * 报送对象 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 
 /**
 * 数据字典 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
 
 /**
 *  服务类

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

 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.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-
 /**
 * 消防队伍 服务类
 *

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.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 
 /**
 * l联系人 服务类

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.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 
 /**
 * 消防员合同 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 
 /**
 * 人员学历 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 
 /**
 * 消防人员配装记录 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 
 /**
 * 岗位信息 服务类

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

 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.baomidou.mybatisplus.extension.service.IService;
-
 /**
 * 消防队员 服务类
 *

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.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 
 /**
 * 消防员思想谈话记录 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 
 /**
 * 工作经历 服务类

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.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
 
 /**
 *  服务类

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 com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
 import java.util.List;

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.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
 /**
 * 调派单位资源 服务类

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.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
 
 /**
 * 调派单位 服务类

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.baomidou.mybatisplus.extension.service.IService;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
 
-import java.util.List;
-
 /**
  * 力量调派 服务类
  *

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.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 
 /**
 * 模板表 服务类

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import java.util.List;
-
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 
  * 动态表单值

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import java.util.List;
-
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.List;
 /**
 * 保存警情接警记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 动态表单类型
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 表单
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 报送对象
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 警情报送记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 数据字典
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 public class FireTeamListVo{
 

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 消防队伍

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * l联系人
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 消防员合同
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 人员学历
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 消防人员配装记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 岗位信息
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 消防员思想谈话记录
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import java.util.Date;
 /**
 * 工作经历
 *

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.velocity.runtime.directive.Foreach;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 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.service.IDataDictionaryService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
 
 @Component
 public class FormList {

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import java.util.List;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 动态表单值
  * 

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 /**
 * 
 *

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

@@ -2,8 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import io.swagger.annotations.ApiModel;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author tb
  * @date 2021-06-01

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java

 package com.yeejoin.amos.boot.module.tzs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author tb
  * @date 2021-06-01

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/RescueStation.java

 package com.yeejoin.amos.boot.module.tzs.api.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -8,10 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
 /**
  * @author tb

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/MaintenanceUnitMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/RescueStationMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/UseUnitMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 
 /**
 *  Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/EquipFeignService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.List;
-import java.util.Map;
-
 
 /**
  * 装备服务feign

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IElevatorService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IMaintenanceUnitService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRescueStationService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IUseUnitService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
-import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 
 /**
 *  服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java

 package com.yeejoin.amos.boot.module.tzs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-import java.util.List;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +8,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01

amos-boot-module/amos-boot-module-biz/amos-boot-module-demo-biz/src/main/java/com/yeejoin/amos/boot/module/demo/biz/controller/DemoController.java

 package com.yeejoin.amos.boot.module.demo.biz.controller;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.demo.api.service.IDemoService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
+import com.yeejoin.amos.boot.module.demo.api.service.IDemoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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;
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-demo-biz/src/main/java/com/yeejoin/amos/boot/module/demo/biz/service/impl/DemoServiceImpl.java

 package com.yeejoin.amos.boot.module.demo.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.demo.api.entity.Demo;
 import com.yeejoin.amos.boot.module.demo.api.mapper.DemoMapper;
 import com.yeejoin.amos.boot.module.demo.api.service.IDemoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/FeignAop.java

 package com.yeejoin.amos.boot.module.jcs.biz.aop;
 
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -15,6 +11,9 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+
 
 /**
  * feign请求header设置

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+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.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.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 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.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.ESAlertCalledService;
-
-import org.springframework.transaction.annotation.Transactional;
-
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -170,7 +162,7 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
+    public ResponseModel<IPage<AlertCalled>> listPage(String pageNum, String pageSize, AlertCalled alertCalled) {
         Page<AlertCalled> pageBean;
         IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();

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;
 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.CommonResponseUtil;
 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;
@@ -31,9 +12,21 @@ 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 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;
 
 
 /**

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormTypeService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormTypeService;
+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;
 
 

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
+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;
 
 

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

@@ -7,24 +7,22 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.*;
+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.vo.SchedulingReportingVo;
 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 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.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.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;
@@ -192,7 +190,7 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{alertCalledId}/alert_submitted", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取警情续报内容", notes = "获取警情续报内容")
-    public ResponseModel getAlertSubmittedContent(@PathVariable Long alertCalledId) {
+    public ResponseModel<Object> getAlertSubmittedContent(@PathVariable Long alertCalledId) {
         ArrayList<TemplateVo> templateVos = new ArrayList<>();
         try {
             // 获取警情详情
@@ -233,7 +231,8 @@ public class AlertSubmittedController extends BaseController {
      * @return
      * @throws IllegalAccessException
      */
-    public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
+    @SuppressWarnings("unchecked")
+	public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
         Map<String, Object> map = new HashMap<>();
         Class<?> clazz = obj.getClass();
         Field[] fields = clazz.getDeclaredFields();
@@ -242,7 +241,7 @@ public class AlertSubmittedController extends BaseController {
             field.setAccessible(true);
             String fieldName = field.getName();
             if ("dynamicFormAlert".equalsIgnoreCase(fieldName)) {
-                List<FormValue> dynamicFormAlert = (List) field.get(obj);
+                List<FormValue> dynamicFormAlert = (List<FormValue>) field.get(obj);
                 for (FormValue formValue : dynamicFormAlert) {
                     map.put(formValue.getLabel(), formValue.getValue());
                 }

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
+import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
+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;
 
 

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 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.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;
 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.CommonResponseUtil;
-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.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 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.Collection;
+import java.util.List;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService;
+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;
 
 

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 com.yeejoin.amos.boot.biz.common.utils.Menu;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FireTeam;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+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.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 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 org.typroject.tyboot.core.foundation.enumeration.UserType;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 
 /**
@@ -58,9 +48,9 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队伍", notes = "新增消防队伍")
-    public ResponseModel saveFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+    public ResponseModel<Object>  saveFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
         iFireTeamService.save(fireTeam);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -72,9 +62,9 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel<Object>  deleteById(HttpServletRequest request, @PathVariable Long id) {
         iFireTeamService.update(new UpdateWrapper<FireTeam>().eq("sequence_nbr", id).set("is_delete", 1));
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -86,9 +76,9 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防队伍", notes = "修改消防队伍")
-    public ResponseModel updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
-        boolean flag = iFireTeamService.updateById(fireTeam);
-        return CommonResponseUtil.success();
+    public ResponseModel<Object> updateByIdFireTeam(HttpServletRequest request, @RequestBody FireTeam fireTeam) {
+        iFireTeamService.updateById(fireTeam);
+        return ResponseHelper.buildResponse(null);
 
     }
 
@@ -102,21 +92,21 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
-        return CommonResponseUtil.success(iFireTeamService.getById(id));
+    public ResponseModel<FireTeam> selectById(HttpServletRequest request, @PathVariable Long id) {
+        return ResponseHelper.buildResponse(iFireTeamService.getById(id));
     }
 
 
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel getFirefighters(Integer pageNum, Integer pageSize, FireTeamListVo fireTeamList) {
+    public ResponseModel<Page<FireTeamVo>> getFirefighters(Integer pageNum, Integer pageSize, FireTeamListVo fireTeamList) {
         //条件分页
         List<FireTeamVo> list = iFireTeamService.getFireTeam(pageNum, pageSize, fireTeamList);
         Map<String, Long> num = iFireTeamService.getFireTeamCount(pageNum, pageSize, fireTeamList);
         Page<FireTeamVo> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
         pageBean.setRecords(list);
-        return CommonResponseUtil.success(pageBean);
+        return ResponseHelper.buildResponse(pageBean);
     }
 
 
@@ -129,15 +119,13 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/listTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "队伍树", notes = "队伍树")
-    public ResponseModel listTree() throws Exception {
+    public ResponseModel<List<Menu>> listTree() throws Exception {
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("is_delete", 0);
         Collection<FireTeam> list = iFireTeamService.listByMap(columnMap);
-        FireTeam ll = new FireTeam();
-        //List<Menu> menus=TreeParser.getTree(null,list);
         List<Menu> menus = TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
                 "getParent");
-        return CommonResponseUtil.success(menus);
+        return ResponseHelper.buildResponse(menus);
     }
 
 

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContactsService;
+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;
 
 

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 com.alibaba.fastjson.JSON;
-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.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
-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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 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 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;
 
 
 /**
@@ -62,8 +52,8 @@ public class FirefightersContractController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防员合同", notes = "新增消防员合同")
-    public ResponseModel saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
-    	 boolean flag= iFirefightersContractService.save(firefightersContract);
+    public ResponseModel<FirefightersContract> saveFirefightersContract(HttpServletRequest request, @RequestBody FirefightersContract firefightersContract){
+    	 iFirefightersContractService.save(firefightersContract);
        	 return ResponseHelper.buildResponse(firefightersContract);
     }
 
@@ -133,7 +123,7 @@ public class FirefightersContractController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<IPage> listPage(String pageNum,String pageSize, FirefightersContract firefightersContract){
+    public ResponseModel<IPage<FirefightersContract>> listPage(String pageNum,String pageSize, FirefightersContract firefightersContract){
 
         Page<FirefightersContract> pageBean;
         QueryWrapper<FirefightersContract> firefightersContractQueryWrapper = new QueryWrapper<>();
@@ -169,9 +159,9 @@ public class FirefightersContractController extends BaseController {
         });
         IPage<FirefightersContract> page;
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
+            pageBean = new Page<FirefightersContract>(0, Long.MAX_VALUE);
         } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+            pageBean = new Page<FirefightersContract>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iFirefightersContractService.page(pageBean, firefightersContractQueryWrapper);
         return ResponseHelper.buildResponse(page);  	 

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

@@ -6,21 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.*;
-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.service.IFirefightersContactsService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersContractService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersPostService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersThoughtService;
+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.vo.FirefightersListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
 import io.swagger.annotations.Api;
@@ -29,13 +19,10 @@ 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.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;
@@ -81,13 +68,13 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员")
-    public ResponseModel saveFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
+    public ResponseModel<Firefighters> saveFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
         Firefighters firefighter= firefighters.getFirefighters();
     	iFirefightersService.save(firefighter);
         FirefightersContacts firefightersContact= firefighters.getFirefightersContacts();
         firefightersContact.setFirefightersId(firefighter.getSequenceNbr());
     	ifirefightersContactsService.save(firefightersContact);
-    	return CommonResponseUtil.success(firefighter);
+    	return ResponseHelper.buildResponse(firefighter);
     }
 
     /**
@@ -99,15 +86,14 @@ public class FirefightersController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     @Transactional
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id){
     	
     	try {
-    		@SuppressWarnings("rawtypes")
-    		QueryWrapper queryWrapper = new QueryWrapper<>();
+    		QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
     		queryWrapper.eq("firefighters_id", id);
     		FirefightersJacket firefightersJacket = iFirefightersJacketService.getOne(queryWrapper);
         	if(firefightersJacket!=null) {
-        		 return CommonResponseUtil.failure("该消防还有在装装备！");  	
+        		throw new RuntimeException("该消防还有在装装备！");  	
         	}       	       	
         	iFirefightersService.update(new UpdateWrapper<Firefighters>().eq("sequence_nbr", id).set("is_delete", 1));     	
         	iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
@@ -118,7 +104,7 @@ public class FirefightersController extends BaseController {
         	iFirefightersJacketService.update(new UpdateWrapper<FirefightersJacket>().eq("firefighters_id", id).set("is_delete", 1));
             //删除缓存
             redisUtils.del(RedisKey.FIREFIGHTERS_ID+id,RedisKey.FIREFIGHTERS_LIST_ID+id);
-           	return CommonResponseUtil.success();
+           	return ResponseHelper.buildResponse(null);
            
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -137,13 +123,13 @@ public class FirefightersController extends BaseController {
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防队员", notes = "修改消防队员")
     @Transactional
-    public ResponseModel updateByIdFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
+    public ResponseModel<Object> updateByIdFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){
         Firefighters firefighter= firefighters.getFirefighters();
     	iFirefightersService.updateById(firefighter);
     	ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
     	//删除缓存
         redisUtils.del(RedisKey.FIREFIGHTERS_ID+firefighter.getSequenceNbr(),RedisKey.FIREFIGHTERS_LIST_ID+firefighter.getSequenceNbr());
-    	return CommonResponseUtil.success();
+    	return ResponseHelper.buildResponse(null);
     }
 
 
@@ -156,20 +142,19 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){             
+    public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){             
 
         if(redisUtils.hasKey(RedisKey.FIREFIGHTERS_ID+id)){
             Object obj= redisUtils.get(RedisKey.FIREFIGHTERS_ID+id);
-            return CommonResponseUtil.success(obj);
+            return ResponseHelper.buildResponse(obj);
         }else{
             Firefighters firefighters=iFirefightersService.getById(id);
-            @SuppressWarnings("rawtypes")
-            QueryWrapper queryWrapper=new QueryWrapper<>();
+            QueryWrapper<FirefightersContacts> queryWrapper=new QueryWrapper<>();
             queryWrapper.eq("firefighters_id", id);
             FirefightersContacts firefightersContacts= ifirefightersContactsService.getOne(queryWrapper);
             FirefightersVo firefightersVo=new FirefightersVo(firefighters, firefightersContacts);
             redisUtils.set(RedisKey.FIREFIGHTERS_ID+id, JSON.toJSON(firefightersVo),time);
-            return CommonResponseUtil.success(firefightersVo);
+            return ResponseHelper.buildResponse(firefightersVo);
         }
     }
 
@@ -181,14 +166,14 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表详情根据id查询", notes = "列表详情根据id查询")
-    public ResponseModel listToSelectById(HttpServletRequest request, @PathVariable Long id){
+    public ResponseModel<Object> listToSelectById(HttpServletRequest request, @PathVariable Long id){
         if(redisUtils.hasKey(RedisKey.FIREFIGHTERS_LIST_ID+id)){
             Object obj= redisUtils.get(RedisKey.FIREFIGHTERS_LIST_ID+id);
-            return CommonResponseUtil.success(obj);
+            return ResponseHelper.buildResponse(obj);
         }else{
             Map<String, Object> firefighters=iFirefightersService.listToSelectById(id);
             redisUtils.set(RedisKey.FIREFIGHTERS_LIST_ID+id, JSON.toJSON(firefighters),time);
-            return CommonResponseUtil.success(firefighters);
+            return ResponseHelper.buildResponse(firefighters);
         }
     }
     /**
@@ -239,7 +224,7 @@ public class FirefightersController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "新列表分页查询", notes = "新表分页查询")
-    public ResponseModel getFirefighters(Integer pageNum,Integer pageSize, FirefightersListVo firefighters){
+    public ResponseModel< Page<Firefighters> > getFirefighters(Integer pageNum,Integer pageSize, FirefightersListVo firefighters){
          //条件分页
         if (null == pageNum || null == pageSize) {
             pageNum = 1;
@@ -249,7 +234,7 @@ public class FirefightersController extends BaseController {
         Map<String, Long> num = iFirefightersService.getFirefightersCount((pageNum - 1) * pageSize, pageSize, firefighters);
         Page<Firefighters> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
         pageBean.setRecords(list);
-        return CommonResponseUtil.success(pageBean);
+        return ResponseHelper.buildResponse(pageBean);
     }
 }
 

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersEducationService;
+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;
 
 

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.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;
 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.CommonResponseUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersJacketService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import 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.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;
 
 /**
  * 消防人员配装记录
@@ -55,10 +47,10 @@ public class FirefightersJacketController extends BaseController {
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增消防人员配装记录", notes = "新增消防人员配装记录")
 	@Transactional
-	public ResponseModel saveFirefightersJacket(HttpServletRequest request,
+	public ResponseModel<Object> saveFirefightersJacket(HttpServletRequest request,
 			@RequestBody List<FirefightersJacket> firefightersJacket) {			
 		iFirefightersJacketService.saveOrUpdateBatch(firefightersJacket);
-		return CommonResponseUtil.success(firefightersJacket);
+		return ResponseHelper.buildResponse(null);
 	}
 
 	/**
@@ -70,9 +62,9 @@ public class FirefightersJacketController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
 	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-	public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
+	public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
 	iFirefightersJacketService.update(new UpdateWrapper<FirefightersJacket>().eq("sequence_nbr", id).set("is_delete", 1));     
-	return CommonResponseUtil.success();
+	return ResponseHelper.buildResponse(null);
 	}
 
 	/**
@@ -83,10 +75,10 @@ public class FirefightersJacketController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "修改消防人员配装记录", notes = "修改消防人员配装记录")
-	public ResponseModel updateByIdFirefightersJacket(HttpServletRequest request,
+	public ResponseModel<FirefightersJacket> updateByIdFirefightersJacket(HttpServletRequest request,
 			@RequestBody FirefightersJacket firefightersJacket) {
-		boolean flag = iFirefightersJacketService.updateById(firefightersJacket);
-		return CommonResponseUtil.success(firefightersJacket);
+		iFirefightersJacketService.updateById(firefightersJacket);
+		return ResponseHelper.buildResponse(firefightersJacket);
 	}
 
 	/**
@@ -98,12 +90,11 @@ public class FirefightersJacketController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-	public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
-		@SuppressWarnings("rawtypes")
-		QueryWrapper queryWrapper = new QueryWrapper<>();
+	public ResponseModel<FirefightersJacket> selectById(HttpServletRequest request, @PathVariable Long id) {
+		QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("firefighters_id", id);
 		FirefightersJacket firefightersJacket = iFirefightersJacketService.getOne(queryWrapper);
-		return CommonResponseUtil.success(firefightersJacket);
+		return ResponseHelper.buildResponse(firefightersJacket);
 	}
 
 	/**
@@ -114,7 +105,7 @@ public class FirefightersJacketController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-	public ResponseModel listPage(String pageNum, String pageSize, FirefightersJacket firefightersJacket) {
+	public ResponseModel<IPage<FirefightersJacket>> listPage(String pageNum, String pageSize, FirefightersJacket firefightersJacket) {
 
 		Page<FirefightersJacket> pageBean;
 		QueryWrapper<FirefightersJacket> firefightersJacketQueryWrapper = new QueryWrapper<>();
@@ -155,7 +146,7 @@ public class FirefightersJacketController extends BaseController {
 		}
 		page = iFirefightersJacketService.page(pageBean, firefightersJacketQueryWrapper);
 
-		return CommonResponseUtil.success(page);
+		return ResponseHelper.buildResponse(page);
 
 	}
 }

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 com.alibaba.fastjson.JSON;
-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.vo.FirefightersVo;
-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.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 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.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 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;
 
 
 /**
@@ -69,12 +64,12 @@ public class FirefightersPostController extends BaseController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增岗位信息", notes = "新增岗位信息")
     @Transactional
-    public ResponseModel saveFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){    	
+    public ResponseModel<Object> saveFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){    	
     	
     		iFirefightersPostService.save(firefightersData.getFirefightersPost());
     		ifirefightersWorkexperienceService.save(firefightersData.getFirefightersWorkexperience());
     		ifirefightersEducationService.save(firefightersData.getFirefightersEducation()) ;
-    		 return CommonResponseUtil.success();  	   	
+    		 return ResponseHelper.buildResponse(null);  	   	
      }
 
     /**
@@ -85,13 +80,13 @@ public class FirefightersPostController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据消防人员id删除岗位和学历信息", notes = "根据 id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id){
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id){
     	iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
     	ifirefightersWorkexperienceService.update(new UpdateWrapper<FirefightersWorkexperience>().eq("firefighters_id", id).set("is_delete", 1));
     	ifirefightersEducationService.update(new UpdateWrapper<FirefightersEducation>().eq("firefighters_id", id).set("is_delete", 1));
         //删除缓存
         redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id);
-    	return CommonResponseUtil.success();  	
+    	return ResponseHelper.buildResponse(null);  	
     }
 
 
@@ -104,14 +99,14 @@ public class FirefightersPostController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改岗位信息", notes = "修改岗位信息")
-    public ResponseModel updateByIdFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){
+    public ResponseModel<Object> updateByIdFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){
         FirefightersPost firefightersPost= firefightersData.getFirefightersPost();
     	    iFirefightersPostService.updateById(firefightersPost);
     		ifirefightersWorkexperienceService.updateById(firefightersData.getFirefightersWorkexperience());
     		ifirefightersEducationService.updateById(firefightersData.getFirefightersEducation());
             //删除缓存
             redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+firefightersPost.getSequenceNbr());
-            return CommonResponseUtil.success();
+            return ResponseHelper.buildResponse(null);
     	 
     }
 
@@ -126,17 +121,17 @@ public class FirefightersPostController extends BaseController {
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
+    public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
         if(redisUtils.hasKey(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id)){
             Object obj= redisUtils.get(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id);
-            return CommonResponseUtil.success(obj);
+            return ResponseHelper.buildResponse(obj);
         }else{
             @SuppressWarnings("rawtypes")
             QueryWrapper queryWrapper=new QueryWrapper<>();
             queryWrapper.eq("firefighters_id", id);
             FirefightersData firefightersData=new FirefightersData( ifirefightersWorkexperienceService.getOne(queryWrapper),  ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
             redisUtils.set(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id, JSON.toJSON(firefightersData),time);
-            return CommonResponseUtil.success(firefightersData);
+            return ResponseHelper.buildResponse(firefightersData);
         }
     }
 

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 com.alibaba.fastjson.JSON;
-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.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
-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.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 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 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;
 
 
 /**
@@ -61,9 +52,9 @@ public class FirefightersThoughtController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增消防员思想谈话记录", notes = "新增消防员思想谈话记录")
-    public ResponseModel saveFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
-    	boolean flag=iFirefightersThoughtService.save(firefightersThought);
-    	return CommonResponseUtil.success(firefightersThought);
+    public ResponseModel<FirefightersThought> saveFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
+    	iFirefightersThoughtService.save(firefightersThought);
+    	return ResponseHelper.buildResponse(firefightersThought);
 
     }
 
@@ -75,7 +66,7 @@ public class FirefightersThoughtController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable String id){
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable String id){
     	String str[] = id.split(",");
    	    List<String> ids= Arrays.asList(str);
      	for (String sequenceNbr : ids) {
@@ -83,7 +74,7 @@ public class FirefightersThoughtController extends BaseController {
             //删除缓存
             redisUtils.del(RedisKey.THOUGHT_ID+sequenceNbr);
      	}
-    	return CommonResponseUtil.success();
+    	return ResponseHelper.buildResponse(null);
 
     }
 
@@ -96,11 +87,11 @@ public class FirefightersThoughtController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "修改消防员思想谈话记录", notes = "修改消防员思想谈话记录")
-    public ResponseModel updateByIdFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
-    	boolean flag= iFirefightersThoughtService.updateById(firefightersThought);
+    public ResponseModel<FirefightersThought>  updateByIdFirefightersThought(HttpServletRequest request, @RequestBody FirefightersThought firefightersThought){
+    	iFirefightersThoughtService.updateById(firefightersThought);
         //删除缓存
         redisUtils.del(RedisKey.THOUGHT_ID+firefightersThought.getSequenceNbr());
-        return CommonResponseUtil.success(firefightersThought);
+        return ResponseHelper.buildResponse(firefightersThought);
 
     }
 
@@ -111,19 +102,18 @@ public class FirefightersThoughtController extends BaseController {
     * @param id
     * @return
     */
-    @SuppressWarnings("unchecked")
 	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id){
+    public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){
 
         if(redisUtils.hasKey(RedisKey.THOUGHT_ID+id)){
             Object obj= redisUtils.get(RedisKey.THOUGHT_ID+id);
-            return CommonResponseUtil.success(obj);
+            return ResponseHelper.buildResponse(obj);
         }else{
             FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
             redisUtils.set(RedisKey.THOUGHT_ID+id, JSON.toJSON(firefightersThought),time);
-            return CommonResponseUtil.success(firefightersThought);
+            return ResponseHelper.buildResponse(firefightersThought);
         }
 
     }
@@ -137,7 +127,7 @@ public class FirefightersThoughtController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel listPage(String pageNum,String pageSize, FirefightersThought firefightersThought){
+    public ResponseModel<IPage<FirefightersThought>> listPage(String pageNum,String pageSize, FirefightersThought firefightersThought){
 
         Page<FirefightersThought> pageBean;
         QueryWrapper<FirefightersThought> firefightersThoughtQueryWrapper = new QueryWrapper<>();
@@ -179,6 +169,6 @@ public class FirefightersThoughtController extends BaseController {
         }
         page = iFirefightersThoughtService.page(pageBean, firefightersThoughtQueryWrapper);
 
-        return CommonResponseUtil.success(page); }
+        return ResponseHelper.buildResponse(page); }
     }
 

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
+import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersWorkexperienceService;
+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;
 
 

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 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;
@@ -15,33 +14,23 @@ 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.OrgPersonVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
 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.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.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.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 java.util.*;
 
 /**
  * @author fengwang
@@ -64,7 +53,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增部门信息", notes = "新增部门信息")
-    public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo) {
+    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo) {
         OrgUsr orgUsr = OrgDepartmentVo.getOrgUsr();
         // 单位新增情况
         iOrgUsrService.save(orgUsr);
@@ -76,7 +65,7 @@ public class OrgDepartmentController {
         });
         // 保存动态表单数据
         iAlertFromValueService.saveBatch(alertFromValuelist);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -88,10 +77,10 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
-    public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -103,7 +92,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) {
+    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) {
         OrgUsr orgUsr = OrgDepartmentVo.getOrgUsr();
         // 单位新增情况
         iOrgUsrService.save(orgUsr);
@@ -115,7 +104,7 @@ public class OrgDepartmentController {
         });
         // 保存动态表单数据
         iAlertFromValueService.saveBatch(alertFromValuelist);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -128,17 +117,17 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门详情", notes = "获取部门详情")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
-        QueryWrapper queryWrapper = new QueryWrapper<>();
+    public ResponseModel<OrgUsrFormVo> selectById(HttpServletRequest request, @PathVariable Long id) {
+        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("alert_called_id", id);
         // 动态表单数据
         List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
-        List<FormValue> formValue = new ArrayList();
+        List<FormValue> formValue = new ArrayList<FormValue>();
         for (AlertFormValue alertFormValue : list) {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
             formValue.add(value);
         }
-        return CommonResponseUtil.success( new OrgUsrFormVo(iOrgUsrService.getById(id), formValue));
+        return ResponseHelper.buildResponse( new OrgUsrFormVo(iOrgUsrService.getById(id), formValue));
     }
 
 
@@ -152,7 +141,7 @@ public class OrgDepartmentController {
     @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
     public IPage<OrgUsr> bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
-        Page<OrgUsr> pageBean = new Page();
+        Page<OrgUsr> pageBean = new Page<>();
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
@@ -171,13 +160,13 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门树", notes = "获取部门树")
-    public ResponseModel selectCompanyTree() throws Exception {
+    public ResponseModel< List<OrgMenu>> selectCompanyTree() throws Exception {
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
         Collection<OrgUsr> list = iOrgUsrService.listByMap(columnMap);
         List<OrgMenu> menus = iOrgUsrService.getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
-        return CommonResponseUtil.success(menus);
+        return ResponseHelper.buildResponse(menus);
     }
 
 
@@ -252,7 +241,7 @@ public class OrgDepartmentController {
 //            });
 //            // 保存动态表单数据
 //            iAlertFromValueService.saveBatch(alertFromValuelist);
-//            return CommonResponseUtil.success();
+//            return ResponseHelper.buildResponse();
 //        }
 //        return CommonResponseUtil.failure("机构类型需为部门");
 //    }
@@ -266,13 +255,12 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门人员列表", notes = "获取部门人员列表")
-    public ResponseModel selectUsersByOrgCode(HttpServletRequest request,@PathVariable Long orgCode) {
-        IPage<OrgUsr> page;
+    public ResponseModel<Collection<OrgUsr>> selectUsersByOrgCode(HttpServletRequest request,@PathVariable Long orgCode) {       
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("biz_org_code", orgCode);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
         columnMap.put("is_delete",CommonConstant.IS_DELETE_00);
-         return  CommonResponseUtil.success(iOrgUsrService.listByMap(columnMap));
+         return  ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
     }
 
     /**
@@ -285,9 +273,9 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "download-template/{type}", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "根据类型导出模板", notes = "根据类型导出模板")
-    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
+    public ResponseModel<Object> downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "部门信息", "部门信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
 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;
@@ -20,26 +19,17 @@ 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.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.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.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 java.util.*;
 
 /**
  * @author fengwang
@@ -74,7 +64,7 @@ public class OrgPersonController {
         });
         // 保存动态表单数据
         iAlertFromValueService.saveBatch(alertFromValuelist);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -89,7 +79,7 @@ public class OrgPersonController {
     public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -105,7 +95,7 @@ public class OrgPersonController {
         // 修改单位信息
         orgUsr.setSequenceNbr(id);
         iOrgUsrService.updateById(orgUsr);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -130,7 +120,7 @@ public class OrgPersonController {
             formValue.add(value);
         }
         OrgUsrFormVo orgUsrFormVo = new OrgUsrFormVo(orgUsr, formValue);
-        return CommonResponseUtil.success(orgUsrFormVo);
+        return ResponseHelper.buildResponse(orgUsrFormVo);
     }
 
 
@@ -144,13 +134,13 @@ public class OrgPersonController {
     @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
     public ResponseModel bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
-        Page<OrgUsr> pageBean = new Page();
+        Page<OrgUsr> pageBean = new Page<>();
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        return CommonResponseUtil.success(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
+        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
     }
 
 
@@ -168,7 +158,7 @@ public class OrgPersonController {
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
         Collection<OrgUsr> list = iOrgUsrService.listByMap(columnMap);
-        return CommonResponseUtil.success(iOrgUsrService.getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType"));
+        return ResponseHelper.buildResponse(iOrgUsrService.getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType"));
     }
 
 
@@ -234,7 +224,7 @@ public class OrgPersonController {
         columnMap.put("biz_org_code", orgCode);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
         iOrgUsrService.listByMap(columnMap);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -250,6 +240,6 @@ public class OrgPersonController {
     public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 }

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrAuthService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsrAuth;
+import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrAuthService;
+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;
 
 

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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
-import com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 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.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 org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.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.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -83,7 +72,7 @@ public class OrgUsrController extends BaseController {
         });
         // 保存动态表单数据
         iAlertFromValueService.saveBatch(alertFromValuelist);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -98,7 +87,7 @@ public class OrgUsrController extends BaseController {
     public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
         // 删除时，只作逻辑删除
         iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -114,7 +103,7 @@ public class OrgUsrController extends BaseController {
         // 修改单位信息
         orgUsr.setSequenceNbr(id);
         iOrgUsrService.updateById(orgUsr);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
 
@@ -138,7 +127,7 @@ public class OrgUsrController extends BaseController {
             FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
             formValue.add(value);
         }
-        return CommonResponseUtil.success(new OrgUsrFormVo(orgUsr, formValue));
+        return ResponseHelper.buildResponse(new OrgUsrFormVo(orgUsr, formValue));
     }
 
 
@@ -158,7 +147,7 @@ public class OrgUsrController extends BaseController {
         } else {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
-        return CommonResponseUtil.success(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
+        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean, new QueryWrapper<OrgUsr>().eq("biz_org_type", bizOrgType)));
     }
 
 
@@ -176,7 +165,7 @@ public class OrgUsrController extends BaseController {
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_COMPANY);
         List<OrgMenu> menus = iOrgUsrService.getTree(null, iOrgUsrService.listByMap(columnMap), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
-        return CommonResponseUtil.success(menus);
+        return ResponseHelper.buildResponse(menus);
     }
 
 
@@ -273,10 +262,10 @@ public class OrgUsrController extends BaseController {
 //                // 添加单位人员信息列表
 //                orgPersonFormVos.add(new OrgPersonFormVo(orgUsr, formValue));
 //            });
-//            return CommonResponseUtil.success(new OrgUsrFormVo(company, formValue, orgPersonFormVos));
+//            return ResponseHelper.buildResponse(new OrgUsrFormVo(company, formValue, orgPersonFormVos));
 //        }
 //        return CommonResponseUtil.failure("根据orgCode获取单位人员列表失败");
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**
@@ -292,6 +281,6 @@ public class OrgUsrController extends BaseController {
     public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "单位信息", "单位信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
-        return CommonResponseUtil.success();
+        return ResponseHelper.buildResponse(null);
     }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompany;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyService;
+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;
 

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 org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
+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;
 

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 com.yeejoin.amos.boot.biz.common.utils.CommonResponseUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
-import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
+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.feign.privilege.model.AgencyUserModel;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * 力量调派
@@ -150,9 +145,9 @@ public class PowerTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
-    public ResponseModel<Object> list(@PathVariable String alert_called_id) {
+    public ResponseModel<PowerTransferVo> list(@PathVariable String alert_called_id) {
         PowerTransferVo powerTransferVo = iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
-        return CommonResponseUtil.success(powerTransferVo);
+        return ResponseHelper.buildResponse(powerTransferVo);
     }
 
     /**
@@ -172,7 +167,7 @@ public class PowerTransferController extends BaseController {
         powerTransferDto.setCompanyName(companyName);
 
         boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
-        return CommonResponseUtil.success(save);
+        return ResponseHelper.buildResponse(save);
     }
 }
 

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

@@ -11,11 +11,7 @@ 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.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.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -54,10 +17,29 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.*;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.*;
 
 /**
  * 获取用户信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/dao/ESAlertCalledRepository.java

 package com.yeejoin.amos.boot.module.jcs.biz.dao;
 
+import com.yeejoin.amos.boot.module.jcs.api.entity.ESAlertCalled;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.ESAlertCalled;
-
 /**
  * 
  * <pre>

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
@@ -15,7 +14,6 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jcs.api.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.biz.dao.ESAlertCalledRepository;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,13 +18,10 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.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.biz.dao.ESAlertCalledRepository;
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 

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

@@ -6,12 +6,13 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFireTeamService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
-import 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 java.util.List;
+import java.util.Map;
+
 /**
 * 消防队伍 服务实现类
 *

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

@@ -5,13 +5,13 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FirefightersMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFirefightersService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
-import 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 java.util.List;
+import java.util.Map;
+
 /**
 * 消防队员 服务实现类
 *

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -17,7 +17,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 力量调派 服务实现类

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

@@ -8,7 +8,10 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.client.AgencyUserClient;
-import com.yeejoin.amos.feign.privilege.model.*;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.PermissionModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,11 +22,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /***
  *

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.TemplateMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.ITemplateService;

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+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.tzs.api.dto.ElevatorDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.ElevatorVo;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/MaintenanceUnitController.java

@@ -23,7 +23,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Arrays;
-import java.util.Map;
 
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueStationController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+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.tzs.api.dto.RescueStationDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
+import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.RescueStationVo;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/UseUnitController.java

@@ -17,11 +17,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.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;

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/MaintenanceUnitServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.MaintenanceUnitMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueStationServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.RescueStationMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/UseUnitServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.UseUnitMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java

@@ -12,7 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;