v1.0.1

pom.xml

@@ -37,6 +37,13 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <!--在引用时请在maven中央仓库搜索最新版本号-->
+            <version>2.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>

src/main/java/com/zjty/inspect/config/MvcConfig.java

@@ -25,14 +25,15 @@ public class MvcConfig extends WebMvcConfigurationSupport {
         // excludePathPatterns 用户排除拦截
         registry.addInterceptor(loginInterceptor)
                 .addPathPatterns("/**")
-                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**");
+                .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**","/doc.html");
         ;
         super.addInterceptors(registry);
     }
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("swagger-ui.html")
-                .addResourceLocations("classpath:/META-INF/resources/");
+//        registry.addResourceHandler("swagger-ui.html")
+//                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
     }

src/main/java/com/zjty/inspect/config/Swagger2Configuration.java

 package com.zjty.inspect.config;
 
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -13,8 +16,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 //
 @Configuration
 @EnableSwagger2
+@EnableKnife4j
+@Import(BeanValidatorPluginsConfiguration.class)
 public class Swagger2Configuration {
-    @Bean
+    /*@Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
@@ -22,15 +27,36 @@ public class Swagger2Configuration {
                 .apis(RequestHandlerSelectors.basePackage("com.zjty.inspect"))
                 .paths(PathSelectors.any())
                 .build();
-    }
+    }*/
+
+//    private ApiInfo apiInfo() {
+//        return new ApiInfoBuilder()
+//                .title("评估api文档")
+//                .description("评估api文档")
+//                .termsOfServiceUrl("/")
+//                .version("1.0")
+//                .build();
+//    }
+@Bean(value = "defaultApi2")
+public Docket defaultApi2() {
+    Docket docket=new Docket(DocumentationType.SWAGGER_2)
+            .apiInfo(apiInfo())
+            //分组名称
+            .groupName("2.X版本")
+            .select()
+            //这里指定Controller扫描包路径
+            .apis(RequestHandlerSelectors.basePackage("com.zjty.inspect"))
+            .paths(PathSelectors.any())
+            .build();
+    return docket;
+}
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("评估api文档")
-                .description("评估api文档")
-//                .termsOfServiceUrl("/")
+                .title("评估APIs文档")
+                .description("评估APIs文档")
+                .termsOfServiceUrl("/")
                 .version("1.0")
                 .build();
     }
-
 }

src/main/java/com/zjty/inspect/entity/Apply.java

 package com.zjty.inspect.entity;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,10 +22,12 @@ public class Apply {
     /**
      * 费用
      */
+    @ApiModelProperty(value = "费用")
     private double cost = -1;
 
     /**
      * 原因
      */
+    @ApiModelProperty(value = "原因")
     private String reason = "-1";
 }

src/main/java/com/zjty/inspect/entity/BaseDes.java

 package com.zjty.inspect.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("枚举公共类")
 public class BaseDes {
+    @ApiModelProperty(value = "code")
     private Integer code;
+    @ApiModelProperty(value = "code对应的名称")
     private String name;
+    @ApiModelProperty(value = "备注")
     private String des;
+    @ApiModelProperty(value = "版本号")
     private String version;
 }

src/main/java/com/zjty/inspect/entity/Browser.java

@@ -24,21 +24,24 @@ public class Browser {
     /**
      * 兼容的浏览器
      */
+    @ApiModelProperty(value = "兼容的浏览器")
     private List<CompatibleBrowser> compatibleBrowsers;
     /**
      * 浏览器插件
      */
+    @ApiModelProperty(value = "浏览器插件")
     private List<BaseDes> browserPlugs;
 
     /**
      * 插件安装情况int 1：是 2：否
      */
-    @ApiModelProperty(value = "插件安装情况int",example = "1")
+    @ApiModelProperty(value = "插件安装情况 1：是 2：否",example = "1")
     private Integer PlugInUnit = -1;
 
     /**
      * 其他兼容的浏览器
      */
+    @ApiModelProperty(value = "其他兼容的浏览器")
     private String otherBrowser;
 
 

src/main/java/com/zjty/inspect/entity/BrowserPlugEnum.java

@@ -15,18 +15,18 @@ public enum  BrowserPlugEnum {
     PRINT(2,"打印调用"),
     SCAN(3,"扫描调用"),
     YIWEIMA(4,"一维码/二维码调用"),
-    OCR(5,"OCR调用"),
-    MOBILE(6,"移动设备同步"),
-    TEXT(7,"在线文本编辑类"),
-    TABLE(8,"在线表单编辑类"),
-    CHART(9,"在线统计图表展现类"),
-    VIDEO(10,"在线视频播放类"),
-    THREED(11,"在线3D建模、渲染、展现"),
-    GIS(12,"在线GIS类"),
-    PERIPHERAL(13,"调用其他外设"),
+    OCR(5,"OCR调用：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    MOBILE(6,"移动设备同步：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    TEXT(7,"在线文本编辑类：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    TABLE(8,"在线表单编辑类：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    CHART(9,"在线统计图表展现类：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    VIDEO(10,"在线视频播放类：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    THREED(11,"在线3D建模、渲染、展现：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    GIS(12,"在线GIS类：请在备注中填写插件名,如需填写多个,请以逗号分隔"),
+    PERIPHERAL(13,"外设调用"),
     ANIMATION(14,"动画"),
     FLASH(14,"Flash"),
-    OTHER(13,"其他");
+    OTHER(13,"其他：请在备注中填写插件名和版本,如需填写多个,请以逗号分隔");
 
     private Integer code;
     private String name;

src/main/java/com/zjty/inspect/entity/CSTechnologyEnum.java

@@ -7,20 +7,20 @@ import java.applet.Applet;
 import java.util.HashMap;
 import java.util.Map;
 
-@ApiModel(value = "cs技术类型")
+@ApiModel(value = "C/S前端开发技术或框架（B/S应用不需要填）")
 @Getter
 public enum CSTechnologyEnum {
-    BUSHEJI(1, "不涉及"),
-    WU(-1, "无 "),
-    C(2, "VC/C++/C#"),
-    VB(3, "VB "),
-    DELPHI(4, "DELPHI"),
-    GO(5, "GO "),
-    QT(6, "QT"),
-    JVM(7, "JVM"),
-    NODEJS(8, "NODEJS"),
-    JAVAAPPLET(9, "JAVA APPLET"),
-    QITA(10, "其他");
+    BUSHEJI(1,"不涉及"),
+    WU(-1,"无"),
+    C(2,"VC/C++/C#"),
+    VB(3,"VB"),
+    DELPHI(4,"Delphi"),
+    GO(5,"Go"),
+    QT(6,"QT"),
+    JVM(7,"JVM"),
+    NODEJS(8,"Node JS"),
+    JAVAAPPLET(9,"Java Applet"),
+    QITA(10,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
     private Integer code;
     private String name;
 

src/main/java/com/zjty/inspect/entity/Database.java

@@ -25,11 +25,13 @@ public class Database {
     /**
      * 数据库类型 枚举
      */
+    @ApiModelProperty(value = "数据库类型")
     private List<DatabaseType> databaseType;
 
     /**
      * 其他
      */
+    @ApiModelProperty(value = "其他")
     private String otherType;
 
     /**
@@ -104,5 +106,6 @@ public class Database {
     /**
      * 其他内容
      */
+    @ApiModelProperty(value = "其他内容")
     private String otherContent;
 }

src/main/java/com/zjty/inspect/entity/Details.java

@@ -27,31 +27,38 @@ public class Details {
     /**
      * 操作系统 枚举
      */
+    @ApiModelProperty(value = "操作系统 枚举")
     private OperateSystem operateSystem = OperateSystem.NONE;
 
     /**
      * 台数
      */
+    @ApiModelProperty(value = "台数")
     private Integer num;
     /**
      * CPU核数
      */
+    @ApiModelProperty(value = "CPU核数")
     private Integer cpuNum;
     /**
      * 单核主频
      */
+    @ApiModelProperty(value = "单核主频")
     private String ghz;
     /**
      * 服务器总空间
      */
+    @ApiModelProperty(value = "服务器总空间")
     private double space;
     /**
      * 其他
      */
+    @ApiModelProperty(value = "其他")
     private String other;
 
     /**
      * 版本
      */
+    @ApiModelProperty(value = "版本")
     private String edition;
 }

src/main/java/com/zjty/inspect/entity/DevelopLanguageSystem.java

 package com.zjty.inspect.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -7,17 +8,24 @@ import java.util.List;
 @Data
 public class DevelopLanguageSystem {
     //原应用主要开发架构
+    @ApiModelProperty(value = "原应用主要开发架构")
     private List<BaseDes> devFrameworks;
     //bs原应用浏览器前端开发技术
+    @ApiModelProperty(value = "bs原应用浏览器前端开发技术")
     private List<BaseDes> fontDevTechnologies;
     //cs前端开发技术
+    @ApiModelProperty(value = "cs前端开发技术")
     private List<BaseDes> csDevTechnologies;
     //封装方式
+    @ApiModelProperty(value = "封装方式")
     private List<BaseDes> opGAs;
     //主开发语言
+    @ApiModelProperty(value = "主开发语言id")
     private Integer code;
+    @ApiModelProperty(value = "主开发语言名称")
     private String name;
 //    private MainLanguageEnum mainLanguageEnum;
     //开发语言
+    @ApiModelProperty(value = "其他开发语言名称")
     private List<BaseDes> devLanguages;
 }

src/main/java/com/zjty/inspect/entity/FontTechnologyEnum.java

@@ -15,17 +15,16 @@ public enum  FontTechnologyEnum {
     CSS("CSS",3),
     ASP("ASP",4),
     HTML("HTML",5),
-    JQUERY("JQUERY框架",6),
-    SPRING("SPRING框架",7),
-    ANGULAR("ANGULAR框架",8),
+    JQUERY("JQuery框架",6),
+    ANGULAR("Angular框架",8),
     VUE("VUE框架",9),
-    REACT("REACT框架",10),
-    QUCIK("QUCIKUI框架",11),
-    LAY("LAYUI框架",12),
-    AVALON("AVALON框架",13),
-    EMBER("EMBER框架",14),
-    AURELIA("AURELIA框架",15),
-    QITA("其他",16);
+    REACT("React框架",10),
+    QUCIK("QucikUI框架",11),
+    LAY("LayUI框架",12),
+    AVALON("Avalon框架",13),
+    EMBER("Ember框架",14),
+    AURELIA("Aurelia框架",15),
+    QITA("其他：请在备注中填写,如需填写多个,请以逗号分隔",16);
     //描述
     private String name;
     //序号

src/main/java/com/zjty/inspect/entity/FrameWorkEnum.java

@@ -6,25 +6,25 @@ import lombok.Getter;
 import java.util.HashMap;
 import java.util.Map;
 
-@ApiModel(value = "架构类型")
+@ApiModel(value = "主开发架构")
 @Getter
 public enum  FrameWorkEnum {
     WU(-1,"无"),
     NET(1,".NET体系下的框架"),
     JEE(2,"J2EE体系下的框架"),
-    PHP(3,"THINKPHP"),
-    YII(4,"YII"),
-    CODEIGNITER(5,"CODEIGNITER"),
-    LARAVEL(6,"LARAVEL"),
-    DJANGO(7,"DJANGO"),
-    TORNADO(8,"TORNADO"),
-    FLASK(9,"FLASK"),
-    TWISTED(10,"TWISTED"),
-    SCRAPY(11,"SCRAPY"),
-    BOTTLE(12,"BOTTLE"),
-    WEBPY(13,"WEBPY"),
-    FALCON(14,"FALCON"),
-    QITA(15,"其他");
+    PHP(3,"ThinkPHP"),
+    YII(4,"Yii"),
+    CODEIGNITER(5,"CodeIgniter"),
+    LARAVEL(6,"Laravel"),
+    DJANGO(7,"Django"),
+    TORNADO(8,"Tornado"),
+    FLASK(9,"Flask"),
+    TWISTED(10,"Twisted"),
+    SCRAPY(11,"Scrapy"),
+    BOTTLE(12,"Bottle"),
+    WEBPY(13,"Webpy"),
+    FALCON(14,"Falcon"),
+    QITA(15,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
 
     private Integer code;
     private String name;

src/main/java/com/zjty/inspect/entity/LanguageEnum.java

@@ -6,22 +6,22 @@ import lombok.Getter;
 import java.util.HashMap;
 import java.util.Map;
 
-@ApiModel(value = "其他语言枚举类")
+@ApiModel(value = "其他开发语言")
 @Getter
 public enum  LanguageEnum {
     WU(-1,"无"),
     C(1,"VC/C++/C#"),
     VB(2,"VB"),
-    DELPHI(3,"DELPHI"),
+    DELPHI(3,"Delphi"),
     PHP(4,"PHP"),
     JAVA(5,"JAVA"),
-    PYTHON(6,"PYTHON"),
-    GO(7,"GO"),
-    RUST(8,"RUST"),
-    RUBY(9,"RUBY"),
-    PERL(10,"PERL"),
-    MATLAB(11,"MATLAB"),
-    QITA(12,"其他");
+    PYTHON(6,"Python"),
+    GO(7,"Go"),
+    RUST(8,"Rust"),
+    RUBY(9,"Ruby"),
+    PERL(10,"Perl"),
+    MATLAB(11,"Matlab"),
+    QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
 
 
     private Integer code;

src/main/java/com/zjty/inspect/entity/LocalSystemDep.java

 package com.zjty.inspect.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class LocalSystemDep {
     //本地操作系统依赖名称
+    @ApiModelProperty(value = "本地操作系统依赖名称")
     private String name;
     //金额
+    @ApiModelProperty(value = "金额")
     private double money;
     //备注
+    @ApiModelProperty(value = "备注")
     private String des;
 }

src/main/java/com/zjty/inspect/entity/MainLanguageEnum.java

@@ -11,16 +11,16 @@ import java.util.Map;
 public enum  MainLanguageEnum {
     C(1,"VC/C++/C#"),
     VB(2,"VB"),
-    DELPHI(3,"DELPHI"),
+    DELPHI(3,"Delphi"),
     PHP(4,"PHP"),
     JAVA(5,"JAVA"),
-    PYTHON(6,"PYTHON"),
-    GO(7,"GO"),
-    RUST(8,"RUST"),
-    RUBY(9,"RUBY"),
-    PERL(10,"PERL"),
-    MATLAB(11,"MATLAB"),
-    QITA(12,"其他");
+    PYTHON(6,"Python"),
+    GO(7,"Go"),
+    RUST(8,"Rust"),
+    RUBY(9,"Ruby"),
+    PERL(10,"Perl"),
+    MATLAB(11,"Matlab"),
+    QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
 
     private Integer code;
     private String name;

src/main/java/com/zjty/inspect/entity/MicroServiceEnum.java

@@ -11,31 +11,31 @@ import java.util.Map;
 @Getter
 public enum MicroServiceEnum {
     NONE(-1,"无"),
-    FLUME(0,"FLUME"),
-    ZOOKEEPER(1,"ZOOKEEPER"),
-    RIBBON(2,"RIBBON"),
-    HYSTIX(3,"HYSTIX"),
+    FLUME(0,"Flume"),
+    ZOOKEEPER(1,"Zookeeper"),
+    RIBBON(2,"Ribbon"),
+    HYSTIX(3,"Hystix"),
     HBASE(4,"HBASE"),
-    HIVE(5,"HIVE"),
-    SPARKSTROM(6,"SPARK STROM"),
-    RESTTEMPLATE(7,"RESTTEMPLATE"),
+    HIVE(5,"Hive"),
+    SPARKSTROM(6,"Spark Strom"),
+    RESTTEMPLATE(7,"RestTemplate"),
     KVM(8,"KVM"),
-    OPENSTACK(9,"OPENSTACK"),
-    KUBERNETES(10,"KUBERNETES"),
-    DOCKER(11,"DOCKER"),
-    EXMOBI(12,"EXMOBI"),
-    DATAV(13,"DATAV"),
-    RAYDATA(14,"RAYDATA"),
-    BIANMU(15,"编目服务"),
-    DITU(16,"地图类微服务"),
-    TUBIAO(17,"图表视图类微服务"),
-    SHIBIE(18,"识别类微服务"),
-    NEIRONG(19,"内容审查类微服务"),
-    FENXI(20,"智能分析类微服务"),
-    DATA(21,"数据引用类微服务"),
-    IOQUICK(22,"流媒体加速类微服务"),
-    JIAMI(23,"加密类微服务"),
-    OTHER(24,"其他");
+    OPENSTACK(9,"Openstack"),
+    KUBERNETES(10,"Kubernetes"),
+    DOCKER(11,"Docker"),
+    EXMOBI(12,"Exmobi"),
+    DATAV(13,"DataV"),
+    RAYDATA(14,"RayData"),
+    BIANMU(15,"编目服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    DITU(16,"地图类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    TUBIAO(17,"图表视图类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    SHIBIE(18,"识别类微服务：请在备注中填写"),
+    NEIRONG(19,"内容审查类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    FENXI(20,"智能分析类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    DATA(21,"数据引用类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    IOQUICK(22,"流媒体加速类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    JIAMI(23,"加密类微服务：请在备注中填写,如需填写多个,请以逗号分隔"),
+    OTHER(24,"其他：请在备注中填写,如需填写多个请以逗号分隔");
     private Integer code;
     private String name;
 

src/main/java/com/zjty/inspect/entity/Middleware.java

@@ -25,18 +25,22 @@ public class Middleware {
     /**
      * 原文件情况 枚举
      */
+    @ApiModelProperty(value = "原文件情况")
     private List<MiddlewareEnum> middlewareEnums;
     /**
      * 原应用第三方api
      */
+    @ApiModelProperty(value = "原应用第三方api")
     private List<OtherApi> otherApis;
     /**
      * 其他中间件
      */
+    @ApiModelProperty(value = "其他中间件")
     private String otherMiddleware;
     /**
     * 额外微服务
     */
+    @ApiModelProperty(value = "额外微服务")
     private List<BaseDes> microServices;
     /*
     更多需求

src/main/java/com/zjty/inspect/entity/OpgaEnum.java

@@ -10,10 +10,10 @@ import java.util.Map;
 @Getter
 public enum OpgaEnum {
     WU(-1,"无"),
-    SETUPINSHEILD(-1,"SETUP/INSTALLSHEILD封装"),
-    MAVEN(-1,"MAVEN打包方式"),
-    GRADLE(-1,"GRADLE打包方式"),
-    QITA(-1,"其他");
+    SETUPINSHEILD(-1,"SetUp/InstallSheild封装"),
+    MAVEN(-1,"Maven打包方式"),
+    GRADLE(-1,"Gradle打包方式"),
+    QITA(-1,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
 
     private Integer code;
     private String name;

src/main/java/com/zjty/inspect/entity/OtherApi.java

 package com.zjty.inspect.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
+@ApiModel(value = "第三方api类")
 @Data
 public class OtherApi {
+    @ApiModelProperty(value = "第三方api code")
+    private String code;
     //第三方api名称
+    @ApiModelProperty(value = "第三方api名称")
     private String apiName;
     //版本号
+    @ApiModelProperty(value = "版本号")
     private String version;
     //备注
+    @ApiModelProperty(value = "备注")
     private String des;
 }

src/main/java/com/zjty/inspect/entity/Reform.java

 package com.zjty.inspect.entity;
 
-import com.zjty.inspect.enums.ApplicationType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,7 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -57,22 +55,26 @@ public class Reform {
     /**
      * 系统名称
      */
+    @ApiModelProperty(value = "系统名称")
     private String projectName;
 
 
     /**
      * 代码地址
      */
+    @ApiModelProperty(value = "代码地址")
     private String codeUrl;
 
     /**
      * 文件名称
      */
+    @ApiModelProperty(value = "文件名称")
     private String codeName;
 
     /**
      * git地址
      */
+    @ApiModelProperty(value = "git地址")
     private String gitUrl;
 
     /**
@@ -97,6 +99,7 @@ public class Reform {
     /**
      * 本地开发单位联系方式
      */
+    @ApiModelProperty(value = "本地开发单位联系方式")
     private String localContact;
 
     /**
@@ -130,6 +133,7 @@ public class Reform {
     /**
      * 该应用类型
      */
+    @ApiModelProperty(value = "该应用类型")
     private List<Integer> applicationType = new ArrayList<>();
 
     /**
@@ -156,53 +160,67 @@ public class Reform {
     /**
      * 系统部署架构
      */
+    @ApiModelProperty(value = "系统部署架构")
     private SystemStructure systemStructure = new SystemStructure();
 
     /**
      * 前端浏览器相关
      */
+    @ApiModelProperty(value = "前端浏览器相关")
     private Browser browser = new Browser();
 
     /**
      * 中间件/API
      */
+    @ApiModelProperty(value = "中间件")
     private Middleware middleware = new Middleware();
 
     /**
      * 数据库相关
      */
+    @ApiModelProperty(value = "数据库相关")
     private Database database = new Database();
 
     /**
-     * 迁移策略 1：休息日 2：晚间切换 3:短暂停止 -1不清楚
+     * 迁移策略 1：休息日或晚间切换 2:暂停服务 3:平滑过渡 -1不清楚
      */
     @ApiModelProperty(value = "迁移策略",example = "1")
     private Integer strategy = -1;
+    @ApiModelProperty(value = "RTO")
+    private Integer rto;
+    @ApiModelProperty(value = "RPO")
+    private Integer rpo;
     /**
      * 额外申请
      */
+    @ApiModelProperty(value = "额外申请")
     private Apply apply = new Apply();
 
     /**
      * 单位名称
      */
+    @ApiModelProperty(value = "单位名称")
     private String unitName;
     /**
      * 原应用是否通过等级保护/分级保护应用测评
      *  -1、我不清楚 1、是 2、否
      */
+    @ApiModelProperty(value = "原应用是否通过等级保护/分级保护应用测评 -1、我不清楚 1、是 2、否")
     private Integer gradeProtection=-1;
     /**
      * 开发周期
      */
+    @ApiModelProperty(value = "开发周期")
     private Integer cycle;
     /**
      * 原开发语言体系
      */
+    @ApiModelProperty(value = "原开发语言体系")
     private DevelopLanguageSystem developLanguageSystem=new DevelopLanguageSystem();
     /**
      * 本地操作系统依赖
      */
+    @ApiModelProperty(value = "本地操作系统依赖")
     private LocalSystemDep localSystemDep=new LocalSystemDep();
 
 }

src/main/java/com/zjty/inspect/entity/SystemStructure.java

@@ -22,34 +22,43 @@ public class SystemStructure {
     /**
      * 应用服务器
      */
+    @ApiModelProperty(value = "ECS（安装主程序的弹性计算服务器或虚拟机）")
     private Details application;
 
     /**
      * 数据库服务器
      */
+    @ApiModelProperty(value = "RDS（关系型数据库服务器或虚拟机）")
     private Details database;
+    @ApiModelProperty(value = "NAS（存储或备份一体设备）")
+    private Details nas;
 
     /**
      * SLB
      */
+    @ApiModelProperty(value = "SLB")
     private Details slb;
     /**
      * cdn
      */
+    @ApiModelProperty(value = "cdn")
     private Details cdn;
     /**
      * V2/P/S（访问代理服务设备）
      */
+    @ApiModelProperty(value = "V2/P/S（访问代理服务设备）")
     private Details vps;
 
     /**
      * 存储
      */
+    @ApiModelProperty(value = "存储")
     private Details storage;
 
     /**
      * 其他服务设备
      */
+    @ApiModelProperty(value = "其他服务设备")
     private Details otherEquipment;
 
     /*
@@ -59,13 +68,13 @@ public class SystemStructure {
     /**
      * 分布式 int 1：是 2：否
      */
-    @ApiModelProperty(value = "权限",example = "1")
+    @ApiModelProperty(value = "分布式 int 1：是 2：否",example = "1")
     private Integer distributed = -1;
 
     /**
      * 负载均衡 int 1：是 2：否
      */
-    @ApiModelProperty(value = "权限",example = "1")
+    @ApiModelProperty(value = "负载均衡 int 1：是 2：否",example = "1")
     private Integer loadBalance = -1;
 
     /**
@@ -80,5 +89,6 @@ public class SystemStructure {
     /**
      * 其他需求
      */
+    @ApiModelProperty(value = "其他需求")
     private String otherDemand;
 }

src/main/java/com/zjty/inspect/enums/ApplicationType.java

@@ -7,15 +7,44 @@ package com.zjty.inspect.enums;
  * @Date : 2020-03-05 16:54
  */
 public enum ApplicationType {
-    OA,
-    MAIL,
-    youjian,
-    taishi,
-    shipin,
-    shuju,
-    menhu,
-    shenqin,
-    ditu,
-    threed,
-    other,
+    OA(0,"办公OA应用类"),
+    MENHU(1,"门户、信息发布、综合入口服务类"),
+    CAIGOU(2,"采购、招投标等采购管理服务类"),
+    XM(3,"项目建设跟踪、过程管理等项目管理服务类"),
+    KG(4,"库管、资产、自然资源、空间等资产分配管理服务类"),
+    CW(5,"财务、审计、税务等财税服务类"),
+    HYTJ(6,"行业统计、发布等统计服务类"),
+    RYSJ(7,"人员、事件、案件、空间等台账管理服务类"),
+    SBTBSP(8,"申报、填报、审批等公共行政服务类"),
+    OTHERWINDOWS(9,"其他重要窗口服务类"),
+    WENYIN(10,"文印、印刷、制版、排版等工具类"),
+    MAIL(11,"邮件、FTP、云盘、ICQ等在线传输工具类"),
+    GIS(12,"地图、定位等GIS服务类"),
+    THRED(13,"3D、模型等视觉建模应用类"),
+    VIDEO(14,"视频、图形等流媒体应用类"),
+    NET(15,"网络安全等常规安管应用类"),
+    baomi(16,"保密监管等特种安全应用类"),
+    SUANFA(17,"提供给行业的算法、API、库、组件、插件等功能型接口类"),
+    JISJ(18,"信息化计算资源、存储资源、网络资源等分配管理应用类"),
+    ANFANG(19,"信息化基础设施、机房设施、安防设施等分配管理应用类"),
+    DATASJI(20,"数据收集、分析、态势感知等大数据应用类"),
+    XINHAOJIESHOU(21,"信号接收、中继、转发等信号处理平台"),
+    ZHIHUI(22,"多信源、多信道、多流程的指挥调度类平台"),
+    DIAODU(23,"多信源、多信道、多流程的监控调度类平台"),
+    XIAOXIN(24,"具备上述多项功能的小型平台"),
+    ZHONXIN(25,"具备上述多项功能的中型平台"),
+    DAXIN(26,"具备上述多项功能的特大型平台")
+
+            ;
+
+    private Integer code;
+    private String name;
+
+    ApplicationType() {
+    }
+
+    ApplicationType(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
 }

src/main/java/com/zjty/inspect/enums/CompatibleBrowser.java

@@ -25,7 +25,7 @@ public enum CompatibleBrowser {
     FIREFOX(7, "Firefox（Gecko内核）"),
     OPERA(8, "Opera（Blink内核）"),
     SECURE(9, "secure"),
-    NONE(-1, "none");
+    NONE(-1, "无");
 
     private Integer code;
     private String name;

src/main/java/com/zjty/inspect/enums/DatabaseType.java

 package com.zjty.inspect.enums;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 
 import java.util.HashMap;

src/main/java/com/zjty/inspect/enums/MiddlewareEnum.java

@@ -15,23 +15,24 @@ import java.util.Map;
  */
 @Getter
 public enum MiddlewareEnum {
-     IIS(1,"IIS"),
-    JONAS(1,"JOnAS"),
-    HADOOP(1,"Hadoop"),
-    KAFKA(1,"Kafka"),
-    SPARK(1,"Spark"),
-    LVS(1,"LVS"),
-    LHA(1,"LHA"),
-    GERONIMO(1,"Geronimo"),
-    JINDIE(1,"金蝶"),
-    DONGFANGTONG(1,"东方通"),
-    OTHER(1,"其他：请在备注中填写,如需填写多个,请以逗号分隔"),
+    NONE(-1,"无"),
+     IIS(0,"IIS"),
     TOMCAT(1,"Tomcat"),
-    JBOSS(1,"JBOSS"),
-    NGNIX(1,"Ngnix"),
-    WEBSPHERE(1,"Websphere"),
-    WEBLOGIC(1,"Weblogic"),
-    NONE(1,"无");
+    NGNIX(2,"Ngnix"),
+    WEBSPHERE(3,"Websphere"),
+    WEBLOGIC(4,"Weblogic"),
+    JBOSS(5,"JBOSS"),
+    JONAS(6,"JOnAS"),
+    HADOOP(7,"Hadoop"),
+    KAFKA(8,"Kafka"),
+    SPARK(9,"Spark"),
+    LVS(10,"LVS"),
+    LHA(11,"LHA"),
+    GERONIMO(12,"Geronimo"),
+    JINDIE(13,"金蝶"),
+    DONGFANGTONG(14,"东方通"),
+    OTHER(15,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
+
      private Integer code;
      private String name;
     private static Map<String, MiddlewareEnum> middlewareEnumMap=new HashMap<>();

src/main/java/com/zjty/inspect/enums/OtherApiEnum.java

+package com.zjty.inspect.enums;
+
+import com.zjty.inspect.entity.MainLanguageEnum;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+@Getter
+public enum  OtherApiEnum {
+    无(1,"无"),
+    JNDI(1,"JNDI"),
+    ML(1,"其他命名与目录类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    JMS(1,"JMS"),
+    RestFul(1,"RestFul"),
+    XX(1,"其他消息类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    AMQP(1,"AMQP"),
+    KAFKA(1,"Kafka API"),
+    MQTT(1,"MQTT"),
+    ROUTE(1,"其他消息路由类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    ES(1,"ES"),
+    YQ(1,"其他搜索引擎类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    LOGSTASH(1,"Logstash"),
+    LOG(1,"其他分析日志类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    KIBANA(1,"Kibana"),
+    FXKS(1,"其他分析可视化类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    REDIS(1,"Redis"),
+    JIQ(1,"其他集群类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    ARCGIS(1,"ARCGIS"),
+    GIS(1,"其他GIS类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    EDIT(1,"在线编辑API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    TUBIAO(1,"统计图表类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    BF(1,"播放类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    YJ(1,"硬件驱动类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    OCR(1,"OCR识别类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    JIAMI(1,"加密类API：请在备注中填写,如需填写多个,请以逗号分隔"),
+    OTHER(1,"其他：请在备注中填写,如需填写多个请以逗号分隔");
+
+    private Integer code;
+    private String name;
+    private static Map<String,OtherApiEnum> otherApiEnumMap=new HashMap<>();
+    static {
+        for (OtherApiEnum otherApiEnum : OtherApiEnum.values()) {
+            otherApiEnumMap.put(otherApiEnum.getName(),otherApiEnum);
+        }
+    }
+    OtherApiEnum() {
+    }
+
+    OtherApiEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public static OtherApiEnum getByName(String name){
+        OtherApiEnum otherApiEnum = otherApiEnumMap.get(name);
+        if(otherApiEnum == null){
+            return null;
+        }
+        return otherApiEnum;
+    }
+}

src/main/java/com/zjty/inspect/enums/RpoEnum.java

+package com.zjty.inspect.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum  RpoEnum {
+    QLM(0,"与RTO时间的前60秒同步"),
+    QLF(1,"与RTO时间的前60分钟同步"),
+    QSS(2,"与RTO时间的前10小时同步"),
+    QESS(3,"与RTO时间的前24小时同步"),
+    HFQ(4,"允许丢失恢复期间所产生的数据"),
+    GJ(5,"允许丢失割接准备时期+恢复期间所产生的数据"),
+    GJALL(6,"允许丢失割接前备份以外的所有数据");
+
+
+    private Integer code;
+    private String name;
+
+    RpoEnum() {
+    }
+
+    RpoEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

src/main/java/com/zjty/inspect/enums/RtoEnum.java

+package com.zjty.inspect.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum RtoEnum {
+    YI(0,"1-60秒"),
+    SHI(1,"10分钟内"),//平滑过渡
+    SAN(2,"30分钟内"),
+    LIU(3,"60分钟内"),
+    Y(4,"1-5小时"),
+    WU(5,"5-10小时"),
+    ERS(6,"24小时内"),
+    SIB(7,"48小时内"),
+    QI(8,"72小时内"),//暂停服务
+    ZH(9,"一周内");//休息日或晚间替换
+
+    private Integer code;
+    private String name;
+
+    RtoEnum() {
+    }
+
+    RtoEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+}

src/main/resources/application.properties

@@ -50,7 +50,7 @@ spring.resources.static-locations=classpath:/uploads/
 # mysql\u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://192.168.1.249:3306/bservice?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
-spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
+spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 spring.datasource.username=root
 spring.datasource.password=root