Merge branch 'master' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect

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

@@ -53,7 +53,12 @@ public class InspectController {
 
     @Autowired
     private ConfigParamDao configParamDao;
-
+    //应用类型转换:小型0
+    Integer[] small = {3,4};
+    //应用类型转换:中型2
+    private Integer[] middle = {1,2,6,7,8,10};
+    //应用类型转换:大型4
+    private Integer[] big = {5,9};
     /**
      * 上传代码进行评估
      *
@@ -141,9 +146,33 @@ public class InspectController {
         }
         System.out.println("admin:"+admin);
         System.out.println(JSON.toJSONString(reform));
+        //架构类型
+        Integer framework = reform.getFramework();
+        if(framework!=null&&framework==1){
+            framework = 2;
+        }
+        //应用类型
+        Integer content = 0;
+        List<Integer> applicationType = reform.getApplicationType();
+        if(applicationType == null || applicationType.size()==0){
+            content = -1;
+        }else {
+            for (Integer type:applicationType) {
+                if(Arrays.asList(middle).contains(type)){
+                    if(content < 2){
+                        content = 2;
+                    }
+                }else if(Arrays.asList(big).contains(type)){
+                    content = 4;
+                    break;
+                }
+            }
+        }
+        System.out.println("content:"+content);
         //输入参数
         String in = JSON.toJSONString(reform);
         InspectParameter inspectParameter = new InspectParameter();
+        inspectParameter.setContent(content);
         inspectParameter.setUsername(reform.getUsername());
         inspectParameter.setValid("1");
         inspectParameter.setSourceAddress(reform.getCodeUrl());
@@ -154,7 +183,7 @@ public class InspectController {
         inspectParameter.setTables(reform.getTableNum());
         inspectParameter.setDisaster(reform.getDisasterTolerance());
         inspectParameter.setData(reform.getDatabaseNum());
-        inspectParameter.setFramework(reform.getFramework());
+        inspectParameter.setFramework(framework);
         inspectParameter.setGitAddress(reform.getGitUrl());
         inspectParameter.setRecastMethod(reform.getMode());
         inspectParameter.setYears(reform.getTime());
@@ -182,6 +211,11 @@ public class InspectController {
          */
         System.out.println(JSON.toJSONString(inspect));
         if(inspect.getRecastMethod()==1 &&(inspect.getLanguage()!=1||inspect.getLanguage()==2)){
+            Evaluation evaluation1=new Evaluation();
+            evaluation1.setInEva(in);
+            evaluation1.setOutEva("500");
+            evaluation1.setUsername(reform.getUsername());
+            evaluationService.save(evaluation1);
             return ResponseEntity.ok(500);
         }
         /*

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -258,7 +258,7 @@ public class WorkLoadUtil {
         */
         FrameDifficulty frameDifficulty = report.getDifficultyAssessment().getFrameDifficulty();
         //系统部署架构难度P（混合：1.1  前后分离：1）即系统评估
-        double pFramework = (frameDifficulty.getDetails()== 1)?1.1:1;
+        double pFramework = (frameDifficulty.getDetails()== 2)?1.1:1;
         logger.info("系统部署架构难度-评估："+pFramework);
         frameDifficulty.setSystemEvaluation(Double.valueOf(nf.format(pFramework)));
         //系统部署架构难度e（分布式 0.2 负载均衡 0.1 容灾0.1 其他0.1） e = 1.2*1.1*1.1*1.1 即用户额外信息