czq

src/main/java/com/zjty/inspect/controller/TechnologyController.java

@@ -95,37 +95,37 @@ public class TechnologyController {
         return  ResponseEntity.ok(new PageResult<Technology>(pageList.getTotalElements(), pageList.getContent()) );
     }
 
-//    @GetMapping("/getReform")
-//    public ResponseEntity getReform(){
-//        Reform reform = new Reform();
-//
-//        return ResponseEntity.ok(reform);
-//    }
-//
-//    @GetMapping("/getp")
-//    public ResponseEntity getp(){
-//        AssessmentReport assessmentReport = new AssessmentReport();
-//
-//        TechnologyList technologyList = assessmentReport.getTechnologyList();
-//        List<TechnologyReport> technologyReports = technologyList.getTechnologyReports();
-//        TechnologyReport technologyReport = new TechnologyReport();
-//        List<TechnologyContent> technologyContents = technologyReport.getTechnologyContents();
-//        TechnologyContent technologyContent = new TechnologyContent();
-//        technologyContents.add(technologyContent);
-//        technologyContents.add(technologyContent);
-//        technologyReport.setTechnologyContents(technologyContents);
-//        technologyReports.add(technologyReport);
-//        technologyList.setTechnologyReports(technologyReports);
-//
-//        DependOnNum dependOnNum = new DependOnNum();
-//        List<DependOnNum> dependOnNums = new ArrayList<>();
-//        dependOnNums.add(dependOnNum);
-//        DifficultyAssessment difficultyAssessment = assessmentReport.getDifficultyAssessment();
-//        difficultyAssessment.getDatabaseDifficulty().setDependOnNum(dependOnNums);
-//        difficultyAssessment.getMiddlewareDifficulty().setDependOnNum(dependOnNums);
-//        difficultyAssessment.getProgramDifficulty().setDependOnNum(dependOnNums);
-//
-//
-//        return ResponseEntity.ok(assessmentReport);
-//    }
+    @GetMapping("/getReform")
+    public ResponseEntity getReform(){
+        Reform reform = new Reform();
+
+        return ResponseEntity.ok(reform);
+    }
+
+    @GetMapping("/getp")
+    public ResponseEntity getp(){
+        AssessmentReport assessmentReport = new AssessmentReport();
+
+        TechnologyList technologyList = assessmentReport.getTechnologyList();
+        List<TechnologyReport> technologyReports = technologyList.getTechnologyReports();
+        TechnologyReport technologyReport = new TechnologyReport();
+        List<TechnologyContent> technologyContents = technologyReport.getTechnologyContents();
+        TechnologyContent technologyContent = new TechnologyContent();
+        technologyContents.add(technologyContent);
+        technologyContents.add(technologyContent);
+        technologyReport.setTechnologyContents(technologyContents);
+        technologyReports.add(technologyReport);
+        technologyList.setTechnologyReports(technologyReports);
+
+        DependOnNum dependOnNum = new DependOnNum();
+        List<DependOnNum> dependOnNums = new ArrayList<>();
+        dependOnNums.add(dependOnNum);
+        DifficultyAssessment difficultyAssessment = assessmentReport.getDifficultyAssessment();
+        difficultyAssessment.getDatabaseDifficulty().setDependOnNum(dependOnNums);
+        difficultyAssessment.getMiddlewareDifficulty().setDependOnNum(dependOnNums);
+        difficultyAssessment.getProgramDifficulty().setDependOnNum(dependOnNums);
+
+
+        return ResponseEntity.ok(assessmentReport);
+    }
 }

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

@@ -19,10 +19,10 @@ public class Apply {
     /**
      * 费用
      */
-    private double cost;
+    private double cost = 1.1;
 
     /**
      * 原因
      */
-    private String reason;
+    private String reason = "***********";
 }

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

@@ -22,62 +22,62 @@ public class AssessmentReport {
     /**
      * 单位名称
      */
-    private String orgName;
+    private String orgName = "****";
 
     /**
      * 系统名称
      */
-    private String sysName;
+    private String sysName = "****";
 
     /**
      * 评估时间
      */
-    private Date time;
+    private Date time = new Date();
 
     /**
      * 难度系数
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
 
     /**
      * 类型预算 1：适配、2：改造
      */
-    private Integer type;
+    private Integer type = 1;
 
     /**
      * 预算金额 double
      */
-    private double budget;
+    private double budget = 1.1;
 
     /**
      * 原系统规模
      */
-    private SysScale sysScale;
+    private SysScale sysScale = new SysScale();
 
     /**
      * 关键技术及替换策略建议
      */
-    private TechnologyList technologyList;
+    private TechnologyList technologyList = new TechnologyList();
 
     /**
      * 基础工作量评估
      */
-    private Workload workload;
+    private Workload workload = new Workload();
 
     /**
      * 额外依赖申请
      */
-    private Apply apply;
+    private Apply apply = new Apply();
 
     /**
      * 适配难度评估
      */
-    private DifficultyAssessment difficultyAssessment;
+    private DifficultyAssessment difficultyAssessment = new DifficultyAssessment();
 
     /**
      * 造价估算
      */
-    private ManufacturingCost manufacturingCost;
+    private ManufacturingCost manufacturingCost = new ManufacturingCost();
 
 }

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

@@ -18,10 +18,10 @@ public class Basis {
     /**
      * 开发量
      */
-    private String developmentVolume;
+    private double developmentVolume = 1.1;
 
     /**
      * 修正系数
      */
-    private double correctionFactor;
+    private double correctionFactor = 1.1;
 }

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

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * <h4>Description : 前端浏览器相关</h4>
  *
@@ -19,7 +21,7 @@ public class Browser {
     /**
      * 兼容的浏览器
      */
-    private CompatibleBrowser compatibleBrowser;
+    private List<CompatibleBrowser> compatibleBrowsers;
 
     /**
      * 插件安装情况int 1：是 2：否

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

@@ -17,37 +17,37 @@ public class BrowserDifficulty {
     /**
      * 系统评估
      */
-    private String systemEvaluation;
+    private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private String message;
+    private double message = 1.1;
 
     /**
      * 综合难度
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
     /**
      * 样式
      */
-    private Integer style;
+    private Integer style = 10;
 
     /**
      * api
      */
-    private Integer api;
+    private Integer api = 10;
 
     /**
      * 插件
      */
-    private Integer plugInUnit;
+    private Integer plugInUnit = 10;
 
     /**
      * 用户额外需求
      */
-    private String demand;
+    private String demand = "*********";
 
 
 }

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

@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * <h4>Description : 数据库相关</h4>
  *
@@ -20,12 +22,12 @@ public class Database {
     /**
      * 数据库类型 枚举
      */
-    private DatabaseType databaseType;
+    private List<DatabaseType> databaseType;
 
     /**
      * 其他
      */
-    private String othertype;
+    private String otherType;
 
     /**
      * 视图 int 1：是 2：否

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,45 +20,45 @@ public class DatabaseDifficulty {
     /**
      * 系统评估
      */
-    private String systemEvaluation;
+    private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private String message;
+    private double message = 1.1;
 
     /**
      * 综合难度
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
     /**
      * 依赖
      */
-    private List<DependOnNum> dependOnNum;
+    private List<DependOnNum> dependOnNum = new ArrayList<>();
 
     /**
      * 容灾 （1：否 2：主备 3：分布式）
      */
-    private Integer disasterTolerance;
+    private Integer disasterTolerance = 1;
 
     /**
      * 安全 1：是 2：否
      */
-    private Integer safe;
+    private Integer safe = 1;
 
     /**
      * 读写分离 1：是 2：否
      */
-    private Integer separate;
+    private Integer separate = 1;
 
     /**
      * 更高性能 1：是 2：否
      */
-    private Integer performance;
+    private Integer performance = 1;
 
     /**
      * 其他内容
      */
-    private Integer otherContent;
+    private Integer otherContent = 1;
 }

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

@@ -18,10 +18,10 @@ public class DependOnNum {
     /**
      * 依赖/jni名称
      */
-    private String name;
+    private String name = "******";
 
     /**
      * 数量
      */
-    private Integer num;
+    private Integer num = 10;
 }

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

@@ -19,30 +19,30 @@ public class DifficultyAssessment {
      6．数据库
      7．本地程序
      */
-    private String des;
+    private String des = "*************************";
 
     /**
      * 系统部署架构难度
      */
-    private FrameDifficulty frameDifficulty;
+    private FrameDifficulty frameDifficulty = new FrameDifficulty();
 
     /**
      * 浏览器难度
      */
-    private BrowserDifficulty browserDifficulty;
+    private BrowserDifficulty browserDifficulty = new BrowserDifficulty();
 
     /**
      * 中间件难度
      */
-    private MiddlewareDifficulty middlewareDifficulty;
+    private MiddlewareDifficulty middlewareDifficulty = new MiddlewareDifficulty();
 
     /**
      * 数据库难度
      */
-    private DatabaseDifficulty databaseDifficulty;
+    private DatabaseDifficulty databaseDifficulty = new DatabaseDifficulty();
 
     /**
      * 本地程序难度
      */
-    private ProgramDifficulty programDifficulty;
+    private ProgramDifficulty programDifficulty = new ProgramDifficulty();
 }

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

@@ -18,16 +18,16 @@ public class Estimate {
     /**
      * 计算值
      */
-    private double Calculation;
+    private double Calculation = 1.1;
 
     /**
      * 操作
      */
-    private String operation;
+    private String operation = "*****";
 
     /**
      * 调整后
      */
-    private double adjustment;
+    private double adjustment = 1.1;
 
 }

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

@@ -18,40 +18,40 @@ public class FrameDifficulty {
     /**
      * 系统评估
      */
-    private String systemEvaluation;
+    private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private String message;
+    private double message = 1.1;
 
     /**
      * 综合难度
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
     /**
      * 详情 1：混合 2：前后端分离
      */
-    private Integer details;
+    private Integer details = 1;
 
     /**
      * 分布式 int 1：是 2：否
      */
-    private Integer distributed;
+    private Integer distributed = 1;
 
     /**
      * 负载均衡 int 1：是 2：否
      */
-    private Integer loadBalance;
+    private Integer loadBalance = 1;
 
     /**
      * 容灾 int 1：是 2：否
      */
-    private Integer disaster;
+    private Integer disaster = 1;
 
     /**
      * 其他需求
      */
-    private String otherDemand;
+    private String otherDemand = "***********";
 }

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

@@ -18,26 +18,26 @@ public class ManufacturingCost {
     /**
      * 人工单价
      */
-    private Estimate artificial;
+    private Estimate artificial = new Estimate();
 
     /**
      * 基础工作量
      */
-    private Estimate workLoad;
+    private Estimate workLoad = new Estimate();
 
     /**
      * 难度系数
      */
-    private Estimate degreeOfDifficulty;
+    private Estimate degreeOfDifficulty = new Estimate();
 
     /**
      * 额外依赖服务申请
      */
-    private Estimate apply;
+    private Estimate apply = new Estimate();
 
     /**
      * 预算费用
      */
-    private Estimate budgetaryCost;
+    private Estimate budgetaryCost = new Estimate();
 
 }

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

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * <h4>Description : 中间件/API</h4>
  *
@@ -20,7 +22,7 @@ public class Middleware {
     /**
      * 原文件情况 枚举
      */
-    private MiddlewareEnum middlewareEnum;
+    private List<MiddlewareEnum> middlewareEnums;
     /**
      * 其他中间件
      */

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,22 +20,22 @@ public class MiddlewareDifficulty {
     /**
      * 系统评估
      */
-    private String systemEvaluation;
+    private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private String message;
+    private double message = 1.1;
 
     /**
      * 综合难度
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
     /**
      * 依赖详情
      */
-    private List<DependOnNum> dependOnNum;
+    private List<DependOnNum> dependOnNum = new ArrayList<>();
 
     /*
      *用户额外信息详情
@@ -42,21 +43,21 @@ public class MiddlewareDifficulty {
     /**
      *Web集群 1:是 2：否
      */
-    private Integer web;
+    private Integer web = 1;
 
     /**
      * Jndi集群 1:是 2：否
      */
-    private Integer jndi;
+    private Integer jndi = 1;
 
     /**
      * Jms集群 1:是 2：否
      */
-    private Integer jms;
+    private Integer jms = 1;
 
     /**
      * 消息路由 1:是 2：否
      */
-    private Integer route;
+    private Integer route = 1;
 
 }

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,20 +20,20 @@ public class ProgramDifficulty {
     /**
      * 系统评估
      */
-    private String systemEvaluation;
+    private double systemEvaluation = 1.1;
 
     /**
      * 额外信息
      */
-    private String message;
+    private double message = 1.1;
 
     /**
      * 综合难度
      */
-    private String difficulty;
+    private double difficulty = 1.1;
 
     /**
      * 依赖详情
      */
-    private List<DependOnNum> dependOnNum;
+    private List<DependOnNum> dependOnNum = new ArrayList<>();
 }

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

@@ -18,10 +18,10 @@ public class Scale {
     /**
      * 数量
      */
-    private Integer num;
+    private Integer num = 10;
 
     /**
      * 备注
      */
-    private String des;
+    private String des = "***";
 }

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

@@ -18,15 +18,15 @@ public class SysScale {
     /**
      * 代码
      */
-    private Scale code;
+    private Scale code = new Scale();
 
     /**
      * 文件
      */
-    private Scale file;
+    private Scale file = new Scale();
 
     /**
      * 模块
      */
-    private Scale mode;
+    private Scale mode = new Scale();
 }

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

@@ -18,25 +18,25 @@ public class TechnologyContent {
     /**
      * 本地程序开发
      */
-    private String local;
+    private String local = "*****";
 
     /**
      * 关键字
      */
-    private String keyWord;
+    private String keyWord= "********";
 
     /**
      * 所在文件
      */
-    private String file;
+    private String file = "*****";
 
     /**
      * 位置
      */
-    private String position;
+    private String position = "*******";
 
     /**
      * 替换策略
      */
-    private Integer strategy;
+    private Integer strategy = 1;
 }

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

@@ -21,10 +21,10 @@ public class TechnologyList {
     /**
      * 建议
      */
-    private String des;
+    private String des = "***************************************************";
 
     /**
      * 技术列表
      */
-    private List<TechnologyReport> technologyReports;
+    private List<TechnologyReport> technologyReports = new ArrayList<>();
 }

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -20,12 +21,12 @@ public class TechnologyReport {
     /**
      * 关键技术
      */
-    private String technology;
+    private String technology = "*******";
 
 
     /**
      * 技术内容
      */
-    private List<TechnologyContent> technologyContents;
+    private List<TechnologyContent> technologyContents = new ArrayList<>();
 
 }

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

@@ -17,17 +17,17 @@ public class Workload {
     /**
      * 描述
      */
-    private String des;
+    private String des = "***************";
 
     /**
      * 开发费用
      */
-    private double cost;
+    private double cost = 1.2;
 
     /**
      *模块数
      */
-    private Integer mode;
+    private Integer mode = 19;
 
     /*
      * 依据
@@ -36,20 +36,20 @@ public class Workload {
     /**
      * 开发
      */
-    private Basis development;
+    private Basis development = new Basis();
 
     /**
      * 测试
      */
-    private Basis test;
+    private Basis test = new Basis();
 
     /**
      * 部署
      */
-    private Basis deploy;
+    private Basis deploy = new Basis();
 
     /**
      * 合计
      */
-    private Basis total;
+    private Basis total = new Basis();
 }

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

@@ -9,4 +9,13 @@ package com.zjty.inspect.enums;
 public enum ApplicationType {
     OA,
     MAIL,
+    youjian,
+    taishi,
+    shipin,
+    shuju,
+    menhu,
+    shenqin,
+    ditu,
+    threed,
+    other,
 }

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

 package com.zjty.inspect.enums;
 
+import jdk.internal.dynalink.beans.BeansLinker;
+
 /**
  * <h4>Description : 兼容的浏览器</h4>
  *
@@ -8,7 +10,11 @@ package com.zjty.inspect.enums;
  */
 public enum CompatibleBrowser {
 
-    IE,
+    IETRIDENT,
+    CHROMEWEBKIT,
     FIREFOX,
+    OPERA,
+    SECURE,
+
 
 }

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

@@ -9,4 +9,7 @@ package com.zjty.inspect.enums;
 public enum DatabaseType {
     ORCLE,
     SQLSERVER,
+    DB2,
+    MYSQL,
+    SYBASE,
 }

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

@@ -9,4 +9,7 @@ package com.zjty.inspect.enums;
 public enum MiddlewareEnum {
     TOMCAT,
     JBOSS,
+    NGNIX,
+    WEBSPHERE,
+    WEBLOGIC,
 }

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

@@ -7,6 +7,8 @@ package com.zjty.inspect.enums;
  * @Date : 2020-03-05 17:03
  */
 public enum OperateSystem {
-    CENTEROS,
-    WINSERVER,
+    CENTEROSREALES,
+    WINSERVER2006,
+    WINSERVER2012,
+    REDHATREALES,
 }