mcj:更新excel导入导出

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

@@ -6,6 +6,8 @@ import com.zjty.inspect.dao.ConfigParamDao;
 import com.zjty.inspect.dao.ExcelDataDao;
 import com.zjty.inspect.dao.TechnologyDao;
 import com.zjty.inspect.entity.*;
+import com.zjty.inspect.enums.LanguageEnum;
+import com.zjty.inspect.enums.OtherApiEnum;
 import com.zjty.inspect.service.*;
 import com.zjty.inspect.utils.*;
 import freemarker.template.TemplateException;
@@ -231,7 +233,8 @@ public class InspectController {
         if ("".equals(reform.getDevelopLanguageSystem().getName())) {
             assessmentReport.setLanguage(inspect.getLanguage());
         } else {
-            assessmentReport.setLanguage(reform.getDevelopLanguageSystem().getCode());
+            LanguageEnum byName = LanguageEnum.getByName(reform.getDevelopLanguageSystem().getName());
+            assessmentReport.setLanguage(byName.getCode());
         }
         //适配还是改造
         assessmentReport.setType(reform.getMode());

src/main/java/com/zjty/inspect/enums/Language.java

-package com.zjty.inspect.enums;
-
-/**
- *
- *
- * @author mcj
- */
-public enum Language {
-
-
-    /**
-     * 语言
-     */
-    JAVA("java",1),
-
-    PYTHON("python",3),
-
-    JAVASCRIPT("js",5),
-
-    GO("go",6),
-
-    HTML("html",7),
-
-    C井("c#",8),
-
-    C("c++",9),
-
-    UNKNOW("unknowun",10);
-
-
-    Language(String name,Integer status){
-        this.name=name;
-        this.status=status;
-    }
-
-    private String name;
-
-    private Integer status;
-
-    public String getName() {
-        return name;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-}

src/main/java/com/zjty/inspect/enums/LanguageEnum.java

@@ -21,8 +21,10 @@ public enum  LanguageEnum {
     RUBY(9,"Ruby"),
     PERL(10,"Perl"),
     MATLAB(11,"Matlab"),
-    QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔");
-
+    QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔"),
+    JAVASCRIPT(13,"JavaScript"),
+    HTML(14,"HTML"),
+    ;
 
     private Integer code;
     private String name;

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

@@ -4,7 +4,7 @@ import com.zjty.inspect.dao.*;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.enums.DependenceManagement;
 import com.zjty.inspect.enums.Framework;
-import com.zjty.inspect.enums.Language;
+import com.zjty.inspect.enums.LanguageEnum;
 import com.zjty.inspect.enums.RecastMethod;
 import com.zjty.inspect.service.RuleService;
 import com.zjty.inspect.utils.*;
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.nio.charset.MalformedInputException;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
@@ -112,7 +111,7 @@ public class Inspector {
      * key：properties
      * value:[{/Users/path},{/Users/path}]
      */
-    private Map<String, Language> suffixLanguageMapping = new HashMap<>(16);
+    private Map<String, LanguageEnum> suffixLanguageMapping = new HashMap<>(16);
 
     /**
      * 规则列表
@@ -264,14 +263,14 @@ public class Inspector {
         //统计文件最多的
         for (Map.Entry<String, Counter> entry : languageMatchMap.entrySet()) {
             if (entry.getValue().getNumber() > maxnum) {
-                Language language = suffixLanguageMapping.get(entry.getKey());
+                LanguageEnum language = suffixLanguageMapping.get(entry.getKey());
                 most = language.name();
-                mostStatus = language.getStatus();
+                mostStatus = language.getCode();
                 maxnum = entry.getValue().getNumber();
             }
         }
         //设置语言
-        report.setLanguage(most == null ? Language.UNKNOW.getStatus() : mostStatus);
+        report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus);
         //设置架构
         report.setFramework(languageMatchMap.get("jsp").i > 0 ? Framework.MIXTURE.getStatus() : Framework.SEPARATE.getStatus());
         //设置是否需要重构

src/main/java/com/zjty/inspect/service/impl/InspectServiceImpl.java

@@ -2,25 +2,22 @@ package com.zjty.inspect.service.impl;
 
 import com.zjty.inspect.dao.ReportDao;
 import com.zjty.inspect.entity.*;
-import com.zjty.inspect.enums.Language;
+import com.zjty.inspect.enums.LanguageEnum;
 import com.zjty.inspect.service.InspectService;
 import com.zjty.inspect.inspect.Inspector;
 import com.zjty.inspect.service.ParameterService;
 import com.zjty.inspect.service.TechnologyService;
 import com.zjty.inspect.utils.FileUtil;
 import com.zjty.inspect.utils.FreemarkerUtils;
-import com.zjty.inspect.utils.RandomUtil;
 import com.zjty.inspect.utils.TimeUtil;
 import freemarker.cache.StringTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
-import freemarker.template.TemplateException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
@@ -48,18 +45,18 @@ public class InspectServiceImpl implements InspectService {
     @Override
     public ReportVo inspect(ReportVo reportVo,InspectParameter inspectParameter) throws IOException {
         //统计文件后缀数量
-        Map<String, Language> suffixLanguageMapping = new HashMap<>();
-        suffixLanguageMapping.put("java", Language.JAVA);
-        suffixLanguageMapping.put("aspx", Language.C井);
-        suffixLanguageMapping.put("cs", Language.C井);
-        suffixLanguageMapping.put("resx", Language.C井);
-        suffixLanguageMapping.put("vue", Language.JAVASCRIPT);
-        suffixLanguageMapping.put("cpp", Language.C);
-        suffixLanguageMapping.put("py", Language.PYTHON);
-        suffixLanguageMapping.put("jsp", Language.JAVA);
-        suffixLanguageMapping.put("go", Language.GO);
-        suffixLanguageMapping.put("js", Language.JAVASCRIPT);
-        suffixLanguageMapping.put("html", Language.HTML);
+        Map<String, LanguageEnum> suffixLanguageMapping = new HashMap<>();
+        suffixLanguageMapping.put("java", LanguageEnum.JAVA);
+        suffixLanguageMapping.put("aspx", LanguageEnum.C);
+        suffixLanguageMapping.put("cs", LanguageEnum.C);
+        suffixLanguageMapping.put("resx", LanguageEnum.C);
+        suffixLanguageMapping.put("vue", LanguageEnum.JAVASCRIPT);
+        suffixLanguageMapping.put("cpp", LanguageEnum.C);
+        suffixLanguageMapping.put("py", LanguageEnum.PYTHON);
+        suffixLanguageMapping.put("jsp", LanguageEnum.JAVA);
+        suffixLanguageMapping.put("go", LanguageEnum.GO);
+        suffixLanguageMapping.put("js", LanguageEnum.JAVASCRIPT);
+        suffixLanguageMapping.put("html", LanguageEnum.HTML);
         //构造成员变量
         inspector.setInspectParameter(inspectParameter);
         //构造报告vo
@@ -106,6 +103,7 @@ public class InspectServiceImpl implements InspectService {
         return null;
     }
     //执行静态化
+    @Override
     public String generateHtml(String templateContent,Map model ){
 
         //创建配置对象