评估报告管理页面修改v1.0.4

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

@@ -25,6 +25,10 @@ public class Browser {
      * 兼容的浏览器
      */
     private List<CompatibleBrowser> compatibleBrowsers;
+    /**
+     * 浏览器插件
+     */
+    private List<BrowserPlug> browserPlugs;
 
     /**
      * 插件安装情况int 1：是 2：否

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class BrowserPlug {
+    private BrowserPlugEnum browserPlugEnum;
+    private String version;
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+
+@Getter
+public enum  BrowserPlugEnum {
+    NONE(-1,"无"),
+    DOWNLOAD(1,"下载/上传"),
+    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,"调用其他外设"),
+    ANIMATION(14,"动画"),
+    FLASH(14,"Flash"),
+    OTHER(13,"其他");
+
+    private Integer code;
+    private String name;
+
+     BrowserPlugEnum() {
+    }
+
+     BrowserPlugEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class CSDevTechnology {
+    private CSTechnologyEnum csTechnologyEnum;
+    //版本
+    private String version;
+    //备注
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+import java.applet.Applet;
+@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, "其他");
+    private Integer code;
+    private String name;
+
+    CSTechnologyEnum() {
+    }
+
+    CSTechnologyEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

@@ -29,6 +29,22 @@ public class Details {
      */
     private OperateSystem operateSystem = OperateSystem.NONE;
 
+    /**
+     * 台数
+     */
+    private Integer num;
+    /**
+     * CPU核数
+     */
+    private Integer cpuNum;
+    /**
+     * 单核主频
+     */
+    private String ghz;
+    /**
+     * 服务器总空间
+     */
+    private double space;
     /**
      * 其他
      */

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+/**
+ * 应用主要开发架构
+ */
+@Data
+public class DevFramework {
+    //架构名称
+    private FrameWorkEnum frameWork;
+    //版本
+    private String version;
+    //备注
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class DevLanguage {
+    private LanguageEnum languageEnum;
+    //版本
+    private String version;
+    //备注
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import java.util.List;
+
+public class DevelopLanguageSystem {
+    //原应用主要开发架构
+    private List<DevFramework> devFrameworks;
+    //bs原应用浏览器前端开发技术
+    private List<FontDevTechnology> fontDevTechnologies;
+    //cs前端开发技术
+    private List<CSDevTechnology> csDevTechnologies;
+    //封装方式
+    private List<OpGA> opGAs;
+    //主开发语言
+    private MainLanguageEnum mainLanguageEnum;
+    //开发语言
+    private List<DevLanguage> devLanguages;
+}

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

+package com.zjty.inspect.entity;
+
+import jdk.nashorn.internal.scripts.JS;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.swing.text.html.CSS;
+import javax.swing.text.html.HTML;
+@Data
+public class  FontDevTechnology {
+
+    private FontTechnologyEnum fontTechnologyEnum;
+    //版本
+    private String version;
+    //备注
+    private String des;
+
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum  FontTechnologyEnum {
+    busheji("不涉及",1),
+    wu("无",-1),
+    js("JS",2),
+    css("CSS",3),
+    asp("ASP",4),
+    html("HTML",5),
+    jquery("JQuery框架",6),
+    spring("Spring框架",7),
+    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);
+    //描述
+    private String des;
+    //序号
+    private Integer code;
+
+    FontTechnologyEnum() {
+    }
+
+    FontTechnologyEnum(String des, int code) {
+        this.des = des;
+        this.code = code;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+@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,"其他");
+
+    private Integer code;
+    private String name;
+    FrameWorkEnum() {
+    }
+
+    FrameWorkEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum  LanguageEnum {
+    wu(-1,"无"),
+    c(1,"VC/C++/C#"),
+    vb(2,"VB"),
+    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,"其他");
+
+    private Integer code;
+    private String name;
+
+    LanguageEnum() {
+    }
+
+    LanguageEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class LocalSystemDep {
+    //本地操作系统依赖名称
+    private String name;
+    //金额
+    private double money;
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum  MainLanguageEnum {
+    c(1,"VC/C++/C#"),
+    vb(2,"VB"),
+    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,"其他");
+
+    private Integer code;
+    private String name;
+
+    MainLanguageEnum() {
+    }
+
+    MainLanguageEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class MicroService {
+    private MicroServiceEnum microServiceEnum;
+    private String version;
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import org.springframework.web.client.RestTemplate;
+
+public enum MicroServiceEnum {
+    none(-1,"无"),
+    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"),
+    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,"其他");
+    private Integer code;
+    private String name;
+
+    MicroServiceEnum() {
+    }
+
+    MicroServiceEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

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

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

+package com.zjty.inspect.entity;
+
+import lombok.Data;
+
+@Data
+public class OpGA {
+    private OpgaEnum opgaEnum;
+    //版本
+    private String version;
+    //备注
+    private String des;
+}

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

+package com.zjty.inspect.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum OpgaEnum {
+    wu(-1,"无"),
+    setupInsheild(-1,"SetUp/InstallSheild封装"),
+    maven(-1,"Maven打包方式"),
+    gradle(-1,"Gradle打包方式"),
+    qita(-1,"其他");
+
+    private Integer code;
+    private String name;
+
+    OpgaEnum() {
+    }
+
+    OpgaEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

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

+package com.zjty.inspect.entity;
+
+public class OtherApi {
+    //第三方api名称
+    private String apiName;
+    //版本号
+    private String version;
+    //备注
+    private String des;
+}

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

@@ -76,24 +76,29 @@ public class Reform {
     private String gitUrl;
 
     /**
-     * 模块数
+     * 模块数 -1不清楚
      */
     @ApiModelProperty(value = "模块数",example = "1")
     private Integer moduleNum = -1;
 
     /**
-     * 原开发费用
+     * 原开发费用 -1不清楚
      */
     @ApiModelProperty(value = "原开发费用",example = "1")
     private Integer cost = -1;
 
 
     /**
-     * 开发单位是否在本地int 1:是 2：否
+     * 开发单位是否在本地int 1:是 2：否 -1不清楚
      */
     @ApiModelProperty(value = "开发单位是否在本地int",example = "1")
     private Integer address = -1;
 
+    /**
+     * 本地开发单位联系方式
+     */
+    private String localContact;
+
     /**
      * 是否为涉密信息系统 int 1:是 2：否
      */
@@ -101,12 +106,13 @@ public class Reform {
     private Integer secret = -1;
 
     /**
-     * 容灾能力 int 1:是 2：否
+     * 容灾能力 int 1:是 2：否 -1不清楚
      */
     @ApiModelProperty(value = "容灾能力",example = "1")
     private Integer disasterTolerance = -1;
 
     /**
+     * -1不清楚
      * 安全能力
      * 1：无
      * 2：弱
@@ -116,7 +122,7 @@ public class Reform {
     private Integer safe = -1;
 
     /**
-     * 架构
+     * 架构 -1不清楚
      */
     @ApiModelProperty(value = "架构",example = "1")
     private Integer framework = -1;
@@ -127,19 +133,19 @@ public class Reform {
     private List<Integer> applicationType = new ArrayList<>();
 
     /**
-     * 运行时间
+     * 运行时间 -1不清楚
      */
     @ApiModelProperty(value = "运行时间",example = "1")
     private Integer time = -1;
 
     /**
-     * 数据库表数量
+     * 数据库表数量 -1不清楚
      */
     @ApiModelProperty(value = "数据库表数量",example = "1")
     private Integer tableNum = -1;
 
     /**
-     * 数据库数据量
+     * 数据库数据量 -1不清楚
      */
     @ApiModelProperty(value = "数据库数据量",example = "1")
     private Integer databaseNum = -1;
@@ -168,7 +174,7 @@ public class Reform {
     private Database database = new Database();
 
     /**
-     * 迁移策略 1：休息日 2：晚间切换 3:短暂停止
+     * 迁移策略 1：休息日 2：晚间切换 3:短暂停止 -1不清楚
      */
     @ApiModelProperty(value = "迁移策略",example = "1")
     private Integer strategy = -1;
@@ -177,5 +183,26 @@ public class Reform {
      */
     private Apply apply = new Apply();
 
+    /**
+     * 单位名称
+     */
     private String unitName;
+    /**
+     * 原应用是否通过等级保护/分级保护应用测评
+     *  -1、我不清楚 1、是 2、否
+     */
+    private Integer gradeProtection=-1;
+    /**
+     * 开发周期
+     */
+    private Integer cycle;
+    /**
+     * 原开发语言体系
+     */
+    private DevelopLanguageSystem developLanguageSystem=new DevelopLanguageSystem();
+    /**
+     * 本地操作系统依赖
+     */
+    private LocalSystemDep localSystemDep=new LocalSystemDep();
+
 }

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

@@ -33,6 +33,14 @@ public class SystemStructure {
      * SLB
      */
     private Details slb;
+    /**
+     * cdn
+     */
+    private Details cdn;
+    /**
+     * V2/P/S（访问代理服务设备）
+     */
+    private Details vps;
 
     /**
      * 存储

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

@@ -9,6 +9,9 @@ package com.zjty.inspect.enums;
  */
 public enum CompatibleBrowser {
 
+    SANLIUL,
+    SAFARI,
+    OTHER,
     IETRIDENT,
     CHROMEWEBKIT,
     FIREFOX,

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

@@ -7,10 +7,29 @@ package com.zjty.inspect.enums;
  * @Date : 2020-03-05 18:02
  */
 public enum DatabaseType {
-    ORACLE,
+    ACCESS,
+    POSTGRESQL,
     SQLSERVER,
-    DB2,
+    ORACLE,
     MYSQL,
     SYBASE,
+    DB2,
+    MARIADB,
+    MONGODB,
+    COUCHBASE,
+    AMAZON,
+    DYNAMODB,
+    COUCHDB,
+    MARKLOGIC,
+    NEO4J,
+    ORIENTDB,
+    TITAN,
+    VIRTUOSO,
+    ARANGODB,
+    HANGAO,
+    DAMENG,
+    SHENTONG,
+    JINCHANG,
+    OTHER,
     NONE,
 }

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

@@ -7,6 +7,17 @@ package com.zjty.inspect.enums;
  * @Date : 2020-03-05 17:53
  */
 public enum MiddlewareEnum {
+     IIS,
+    JONAS,
+    HADOOP,
+    KAFKA,
+    SPARK,
+    LVS,
+    LHA,
+    GERONIMO,
+    JINDIE,
+    DONGFANGTONG,
+    OTHER,
     TOMCAT,
     JBOSS,
     NGNIX,

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

 package com.zjty.inspect.enums;
 
+import sun.plugin2.os.windows.Windows;
+
 /**
  * <h4>Description : 操作系统</h4>
  *
@@ -7,11 +9,36 @@ package com.zjty.inspect.enums;
  * @Date : 2020-03-05 17:03
  */
 public enum OperateSystem {
+
+    WINDOWSXP10,
+    WINDOWSSERVER200816,
+    WINDOWSSERVER201620,
+    REDHATORACLELINUX,
+    CENTOS,
+    UBUNTU,
+    SUSE,
+    DEBIAN,
+    FEDORA,
+    MAGEIA,
+    LEDE,
+    OPENWRT,
+    DEEPIN,
+    UOS,
+    WINNINGKIRIN,
+    MILKYKIRIN,
+    ZHONGKEFANGDE,
+    XINZIDIAN,
+    PUHUA,
+    APPLEUNIXGNU,
+    IBMAIX,
+    HPUX,
+    SUNSOLARIS,
+    MPISIRIX,
+    OTHER,
     CENTEROSREALES,
     WINSERVER2006,
     WINSERVER2012,
     REDHATREALES,
-    UBUNTU,
     AIX,
     NONE,
 }