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

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

@@ -191,6 +191,8 @@ public class InspectController {
         将马晨俊的数据放入输出的表单
          */
         AssessmentReport assessmentReport = new AssessmentReport();
+        //架构
+        assessmentReport.setFramework(inspect.getFramework());
         //语言
         assessmentReport.setLanguage(inspect.getLanguage());
         //适配还是改造
@@ -228,7 +230,7 @@ public class InspectController {
         //jni数量
         int jni = 0;
         //中间件依赖数量
-        int dependOnNum = 0;
+       // int dependOnNum = 0;
         HashMap<String, List<Warn>> warnDetails = inspect.getWarnDetails();
         Set<String> keySet = warnDetails.keySet();
         List<TechnologyReport> technologyReports = new ArrayList<>();
@@ -245,10 +247,10 @@ public class InspectController {
                     technologyContent.setFile(warn.getFilePath());
                     technologyContent.setKeyWord(warn.getRule());
                     technologyContent.setPosition(warn.getLineNum().toString());
-                    String categoryId = warn.getCategoryId();
-                    if(!Objects.equals(categoryId, "0") &&categoryId!=null&& Objects.equals(categoryId, "1")){
-                        dependOnNum += 1;
-                    }
+//                    String categoryId = warn.getCategoryId();
+//                    if(!Objects.equals(categoryId, "0") &&categoryId!=null&& Objects.equals(categoryId, "1")){
+//                        dependOnNum += 1;
+//                    }
                     technologyContents.add(technologyContent);
                 }
                 if(Objects.equals(key, "Microsoft CSS extensions(不支持)")){
@@ -327,7 +329,7 @@ public class InspectController {
 //            dependOnNum.setNum(num.get(s));
 //            dependOnNums.add(dependOnNum);
 //        }
-        middlewareDifficulty.setDependOnNum(dependOnNum);
+        middlewareDifficulty.setDependOnNum(inspect.getSupportSize());
         Middleware middleware = reform.getMiddleware();
         middlewareDifficulty.setWeb(middleware.getWeb());
         middlewareDifficulty.setJms(middleware.getJms());

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

@@ -49,6 +49,11 @@ public class AssessmentReport {
      */
     private Integer type;
 
+    /**
+     * 架构
+     */
+    private Integer framework;
+
     /**
      * 预算金额 double
      */

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

@@ -405,9 +405,9 @@ public class WorkLoadUtil {
         }
         report.getTechnologyList().setDes(string.substring(0,string.length()-1)+"。");
         String type = "";
-        if(report.getType()==2){
+        if(report.getType()==1){
             type = "改造";
-        }else if(report.getType()==1){
+        }else if(report.getType()==2){
             type = "适配";
         }
         String workloadDes = "本系统通过选择"+type+"方式部署到国产化安全自主可控环境上。代码层面的关键工作量包含"+nf.format(totalWorkload)+"人工月（包含对不可预见的估算）";