czq

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

@@ -136,6 +136,20 @@ public class InspectController {
 
     @PostMapping("/rapidAssessment")
     public ResponseEntity rapidAssessment(@RequestBody Reform reform){
+        //输入参数
+        String in = JSON.toJSONString(reform);
+        Evaluation evaluation=new Evaluation();
+        evaluation.setInEva(in);
+        //判断评估类型
+        if(reform.getAssessmentType() == 1){
+            //快速评估
+            reform.setSystemStructure(new SystemStructure());
+            reform.setBrowser(new Browser());
+            reform.setMiddleware(new Middleware());
+            reform.setDatabase(new Database());
+            reform.setApply(new Apply());
+            reform.setStrategy(-1);
+        }
         //获取admin
         Config adminConfig = configParamDao.findByName("admin");
         Integer admin;
@@ -169,8 +183,7 @@ public class InspectController {
             }
         }
         System.out.println("content:"+content);
-        //输入参数
-        String in = JSON.toJSONString(reform);
+
         InspectParameter inspectParameter = new InspectParameter();
         inspectParameter.setContent(content);
         inspectParameter.setUsername(reform.getUsername());
@@ -401,12 +414,12 @@ public class InspectController {
         double f = budget.getProportion()*budget.getSysFund()*budget.getMoneyRate()*budget.getCoefficient();
         System.out.println("F:"+f);
         workLoadUtil.result(reform, assessmentReport, f, 1.5);
-        Evaluation evaluation=new Evaluation();
+
 
         //输出参数
         String out = JSON.toJSONString(assessmentReport);
 
-        evaluation.setInEva(in);
+
         evaluation.setOutEva(out);
         evaluation.setUsername(reform.getUsername());
         evaluationService.save(evaluation);

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

@@ -33,6 +33,10 @@ public class Reform {
      */
     private String username;
 
+    /**
+     *评估类型1：快速   2：详细
+     */
+    private Integer assessmentType;
     /*
     快速评估部分
      */