mcj:新增统语言计、wps导出

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

@@ -5,6 +5,7 @@ import com.zjty.inspect.dao.ConfigParamDao;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.enums.LanguageEnum;
 import com.zjty.inspect.service.*;
+import com.zjty.inspect.thread.task.AsyncTask;
 import com.zjty.inspect.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,6 +44,8 @@ public class InspectController {
     @Autowired
     private ConfigParamDao configParamDao;
 
+    @Autowired
+    private AsyncTask asyncTask;
     //应用类型转换:小型0
     Integer[] small = {3, 4};
     //应用类型转换:中型2
@@ -380,6 +383,7 @@ public class InspectController {
     private ResponseEntity uploads(@RequestParam(value = "file") MultipartFile multfile) {
         try {
             File file = FileUtil.saveToLocal(multfile);
+
             String name = file.getName();
             String path = file.getCanonicalPath();
             return ResponseEntity.ok(new com.zjty.inspect.entity.File(name, path));

src/main/java/com/zjty/inspect/inspect/Inspector.java

@@ -261,6 +261,7 @@ public class Inspector {
      * 比对源文件数量得出语言架构
      */
     private void setReportLanguageAndFrame() {
+        HashSet<LanguageEnum> languageEnums = new HashSet<>();
         String most = null;
         int mostStatus = 0;
         int maxnum = 0;
@@ -272,20 +273,28 @@ public class Inspector {
                 mostStatus = language.getCode();
                 maxnum = entry.getValue().getNumber();
             }
-
+            if (entry.getValue().getNumber() > 0) {
+                LanguageEnum language = suffixLanguageMapping.get(entry.getKey());
+                languageEnums.add(language);
             }
-        //设置语言
-        report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus);
-        //设置架构
-        report.setFramework(languageMatchMap.get("jsp").i > 0 ? Framework.MIXTURE.getStatus() : Framework.SEPARATE.getStatus());
-        //设置是否需要重构
-        if (languageMatchMap.get("jsp").i == 0 & languageMatchMap.get("java").i == 0) {
+        }
+        List<LanguageEnum> languageEnums1 = languageEnums.stream()
+                .filter(e -> e.getCode() != 4 & e.getCode() != 5 & e.getCode() != 6)
+                .collect(Collectors.toList());
+        if (!languageEnums1.isEmpty()) {
             report.setRecastMethod(RecastMethod.RECONSITUTION.getStatus());
             log.info("inspect:代码解析完成,建议进行适配重构");
         } else {
             report.setRecastMethod(RecastMethod.MODIFICATION.getStatus());
             log.info("inspect:代码解析完成,建议进行代码修改");
         }
+
+        //设置语言
+        report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus);
+        //设置架构
+        report.setFramework(languageMatchMap.get("jsp").i > 0 ? Framework.MIXTURE.getStatus() : Framework.SEPARATE.getStatus());
+        //设置是否需要重构
+
     }
 
     /**
@@ -605,8 +614,8 @@ public class Inspector {
                         try {
                             List<String> allLines = Files.readAllLines(file);
                             fileLine += allLines.size();
-                        }catch (IOException e){
-                            log.error("当前文件无法读取:{}",e.getMessage());
+                        } catch (IOException e) {
+                            log.error("当前文件无法读取:{}", e.getMessage());
                         }
 
                         for (Map.Entry<String, PathMatcher> entry : languageSuffixMatcherMapping.entrySet()) {

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

@@ -38,6 +38,7 @@ public class WpsUtil {
         keyValue.put("safe",flipSafeStrong(reform.getSafe()));
         keyValue.put("framework",Framework.getByCode(reform.getFramework()).getName());
         for (int i = 0; i < reform.getApplicationType().size(); i++) {
+
             Integer code = reform.getApplicationType().get(i);
             keyValue.put("applicationType"+i+1,ApplicationType.getByCode(code).getName());
         }
@@ -71,36 +72,34 @@ public class WpsUtil {
         getSys("vps",vps,keyValue);
 
         Browser browser = reform.getBrowser();
-        List<BaseDes> compatibleBrowsers = browser.getCompatibleBrowsers();
-        for (int i = 0; i < compatibleBrowsers.size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("compatibleBrowsers"+i1, compatibleBrowsers.get(i).getName());
-        }
-
-        List<BaseDes> browserPlugs = browser.getBrowserPlugs();
-        for (int i = 0; i < browserPlugs.size(); i++) {
-            keyValue.put("browserPlugs"+i+1, browserPlugs.get(i).getName());
-        }
 
+        repairMap("compatibleBrowsers",13,browser.getCompatibleBrowsers(),keyValue);
+        repairMap("browserPlugs",13,browser.getBrowserPlugs(),keyValue);
+        repairMap("middleware",13,reform.getMiddleware().getMiddlewareEnums(),keyValue);
         Middleware middleware = reform.getMiddleware();
-        for (int i = 0; i < middleware.getMiddlewareEnums().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("middleware"+i1, middleware.getMiddlewareEnums().get(i).getName());
-        }
         List<OtherApi> otherApis = middleware.getOtherApis();
-        for (int i = 0; i < otherApis.size(); i++) {
+        for (int i = 0; i < 13; i++) {
             int i1 = i + 1;
-            keyValue.put("otherApi"+i1, otherApis.get(i).getApiName());
+            if(i>=otherApis.size()){
+                keyValue.put("otherApi"+i1, "无");
+                continue;
             }
-        for (int i = 0; i < middleware.getMicroServices().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("microService"+i1, middleware.getMicroServices().get(i).getName());
+            keyValue.put("otherApi"+i1, otherApis.get(i).getApiName());
         }
+        repairMap("microService",13,middleware.getMicroServices(),keyValue);
+
+
         Database database1 = reform.getDatabase();
-        for (int i = 0; i < database1.getDatabaseType().size(); i++) {
+        for (int i = 0; i < 13; i++) {
             int i1 = i + 1;
+            if(i>=database1.getDatabaseType().size()){
+                keyValue.put("database"+i1, "无");
+                continue;
+            }
             keyValue.put("database"+i1, database1.getDatabaseType().get(i).getName());
         }
+
+
         keyValue.put("databaseView", flipYesOrNo(database1.getView()));
         keyValue.put("databaseStorage", flipYesOrNo(database1.getStorage()));
         keyValue.put("databaseFunction", flipYesOrNo(database1.getFunction()));
@@ -120,26 +119,13 @@ public class WpsUtil {
 
         DevelopLanguageSystem developLanguageSystem = reform.getDevelopLanguageSystem();
         keyValue.put("language",developLanguageSystem.getName());
-        for (int i = 0; i < developLanguageSystem.getDevFrameworks().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("devFrameworks"+i1, developLanguageSystem.getDevFrameworks().get(i).getName());
-        }
-        for (int i = 0; i < developLanguageSystem.getFontDevTechnologies().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("fontDevTechnologies"+i1, developLanguageSystem.getFontDevTechnologies().get(i).getName());
-        }
-        for (int i = 0; i < developLanguageSystem.getCsDevTechnologies().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("csDevTechnologies"+i1, developLanguageSystem.getCsDevTechnologies().get(i).getName());
-        }
-        for (int i = 0; i < developLanguageSystem.getOpGAs().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("opGAs"+i1, developLanguageSystem.getOpGAs().get(i).getName());
-        }
-        for (int i = 0; i < developLanguageSystem.getDevLanguages().size(); i++) {
-            int i1 = i + 1;
-            keyValue.put("devLanguages"+i1, developLanguageSystem.getDevLanguages().get(i).getName());
-        }
+
+        repairMap("devFrameworks",13,developLanguageSystem.getDevFrameworks(),keyValue);
+        repairMap("fontDevTechnologies",13,developLanguageSystem.getFontDevTechnologies(),keyValue);
+        repairMap("csDevTechnologies",13,developLanguageSystem.getCsDevTechnologies(),keyValue);
+        repairMap("opGAs",13,developLanguageSystem.getOpGAs(),keyValue);
+        repairMap("devLanguages",13,developLanguageSystem.getDevLanguages(),keyValue);
+
 
         LocalSystemDep localSystemDep = reform.getLocalSystemDep();
         keyValue.put("localSystemDepName", localSystemDep.getName());
@@ -415,4 +401,15 @@ public class WpsUtil {
         keyValue.put(sysName+"Edition",application.getEdition());
         keyValue.put(sysName+"Memory",application.getMemory());
     }
+
+    private static void repairMap(String name,int size, List<BaseDes> list, Map<String, String> keyValue){
+        for (int i = 0; i < size; i++) {
+            int i1 = i + 1;
+            if(i>=list.size()){
+                keyValue.put("compatibleBrowsers"+i1, "无");
+                continue;
+            }
+            keyValue.put(name+i1, list.get(i).getName());
+        }
+    }
 }