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

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;
@@ -53,6 +54,8 @@ public class InspectController {
     @Value("${upload.location}")
     private String uploadPath;
 
+    @Autowired
+    private AsyncTask asyncTask;
     //应用类型转换:小型0
     Integer[] small = {3, 4};
     //应用类型转换:中型2
@@ -390,6 +393,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/service/impl/DocumentServiceImpl.java

@@ -42,9 +42,7 @@ public class DocumentServiceImpl implements DocumentService {
                     String name = titleHead.getName();
                     if (!StringUtils.isEmpty(name)) {
                         //标题级别
-                        int parentId = titleHead.getParentId();
-                        String s = titleContent.replaceAll("#title#", name)
-                                .replaceAll("#parentId#", String.valueOf(parentId));
+                        String s = titleContent.replaceAll("#title#", name);
                         sb.append(s);
                     }
                     List<DocumentContent> documentContents = titleHead.getDocumentContents();

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

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public class FreeMakerUtils {
 
-        public static String parseTpl(String viewName, Map<String, List<TechnologyContent>> params) {
+        public static String parseTpl(String viewName, Map params) {
             Configuration cfg = SpringContextHolder.getBean(Configuration.class);
             String html = null;
             Template t = null;
@@ -18,7 +18,7 @@ public class FreeMakerUtils {
                 t = cfg.getTemplate(viewName + ".ftl");
                 createWord(t,params);
 //                html = FreeMarkerTemplateUtils.processTemplateIntoString(t, params);
-                System.out.println(html);
+//                System.out.println(html);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -78,5 +78,32 @@ public class FreeMakerUtils {
             }
         }
     }
+    public static void createStringTemplate(Map map,String template){
+        try {
+            //文件路径
+            String filePath= "E://doc";
+
+            //文件名称
+            String fileName = System.currentTimeMillis()+".doc";
+            // 输出文件
+            File outFile = new File(filePath + File.separator + fileName);
+
+            // 如果输出目标文件夹不存在，则创建
+            if (!outFile.getParentFile().exists()) {
+                outFile.getParentFile().mkdirs();
+            }
+
+            // 将模板和数据模型合并生成文件
+            Writer out = new BufferedWriter(new OutputStreamWriter(
+                    new FileOutputStream(outFile), "UTF-8"));
+            Template t = new Template("template", new StringReader(template), new Configuration(Configuration.VERSION_2_3_23));
+            t.process(map,out);
+            // 关闭流
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 }