mcj:更新导入excel表格

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

@@ -41,7 +41,7 @@ public enum CSTechnologyEnum {
     public static CSTechnologyEnum getByName(String name){
         CSTechnologyEnum csTechnologyEnum = csTechnologyEnumMap.get(name);
         if(csTechnologyEnum == null){
-            return null;
+            return QITA;
         }
         return csTechnologyEnum;
     }

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

@@ -47,7 +47,7 @@ public enum  FontTechnologyEnum {
     public static FontTechnologyEnum getByName(String name){
         FontTechnologyEnum fontTechnologyEnum = fontTechnologyEnumMap.get(name);
         if(fontTechnologyEnum == null){
-            return null;
+            return QITA;
         }
         return fontTechnologyEnum;
     }

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

@@ -44,7 +44,7 @@ public enum  FrameWorkEnum {
     public static FrameWorkEnum getByName(String name){
         FrameWorkEnum frameWorkEnum = frameWorkEnumMap.get(name);
         if(frameWorkEnum == null){
-            return null;
+            return QITA;
         }
         return frameWorkEnum;
     }

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

@@ -43,7 +43,7 @@ public enum  LanguageEnum {
     public static LanguageEnum getByName(String name){
         LanguageEnum languageEnum = languageEnumMap.get(name);
         if(languageEnum == null){
-            return null;
+            return QITA;
         }
         return languageEnum;
     }

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

@@ -41,7 +41,7 @@ public enum  MainLanguageEnum {
     public static MainLanguageEnum getByName(String name){
         MainLanguageEnum mainLanguageEnum = mainLanguageEnumMap.get(name);
         if(mainLanguageEnum == null){
-            return null;
+            return QITA;
         }
         return mainLanguageEnum;
     }

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

@@ -54,7 +54,7 @@ public enum MicroServiceEnum {
     public static MicroServiceEnum getByName(String name){
         MicroServiceEnum microServiceEnum = microServiceEnumMap.get(name);
         if(microServiceEnum == null){
-            return null;
+            return OTHER;
         }
         return microServiceEnum;
     }

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

@@ -34,7 +34,7 @@ public enum OpgaEnum {
     public static OpgaEnum getByName(String name){
         OpgaEnum opgaEnum = opgaEnumMap.get(name);
         if(opgaEnum == null){
-            return null;
+            return OpgaEnum.QITA;
         }
         return opgaEnum;
     }

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

@@ -46,7 +46,7 @@ public enum CompatibleBrowser {
     public static CompatibleBrowser getByName(String name) {
         CompatibleBrowser compatibleBrowser = compatibleBrowserMap.get(name);
         if (compatibleBrowser == null) {
-            return null;
+            return NONE;
         }
         return compatibleBrowser;
     }

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

@@ -57,7 +57,7 @@ public enum DatabaseType {
     public static DatabaseType getByName(String name) {
         DatabaseType databaseType = databaseTypeMap.get(name);
         if (databaseType == null) {
-            return null;
+            return OTHER;
         }
         return databaseType;
     }

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

@@ -5,8 +5,8 @@ public enum Framework {
     /**
      * 架构
      */
-    分离型架构("分离型架构",1),
-    混合型架构("混合型架构",2);
+    SEPARATE("分离型架构",1),
+    MIXTURE("混合型架构",2);
 
     Framework(String name,Integer status){
         this.name=name;

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

@@ -5,8 +5,8 @@ public enum RecastMethod {
     /**
      * 架构
      */
-    适配重构("适配重构",1),
-    代码修改("代码修改",2);
+    RECONSITUTION("适配重构",1),
+    MODIFICATION("代码修改",2);
 
     RecastMethod(String name, Integer status){
         this.name=name;

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

@@ -273,13 +273,13 @@ public class Inspector {
         //设置语言
         report.setLanguage(most == null ? Language.UNKNOW.getStatus() : mostStatus);
         //设置架构
-        report.setFramework(languageMatchMap.get("jsp").i > 0 ? Framework.混合型架构.getStatus() : Framework.分离型架构.getStatus());
+        report.setFramework(languageMatchMap.get("jsp").i > 0 ? Framework.MIXTURE.getStatus() : Framework.SEPARATE.getStatus());
         //设置是否需要重构
         if (languageMatchMap.get("jsp").i == 0 & languageMatchMap.get("java").i == 0) {
-            report.setRecastMethod(RecastMethod.适配重构.getStatus());
+            report.setRecastMethod(RecastMethod.RECONSITUTION.getStatus());
             log.info("inspect:代码解析完成,建议进行适配重构");
         } else {
-            report.setRecastMethod(RecastMethod.代码修改.getStatus());
+            report.setRecastMethod(RecastMethod.MODIFICATION.getStatus());
             log.info("inspect:代码解析完成,建议进行代码修改");
         }
     }

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

@@ -30,18 +30,19 @@ import java.util.Optional;
 public class EvaluationServiceImpl implements EvaluationService {
     @Autowired
     private EvaluationDao evaluationDao;
+
     @Override
     public Evaluation save(Evaluation evaluation) {
-        if(StringUtils.isEmpty(evaluation.getInEva())) {
+        if (StringUtils.isEmpty(evaluation.getInEva())) {
             return null;
         }
-        if(StringUtil.isNullOrEmpty(evaluation.getOutEva())) {
+        if (StringUtil.isNullOrEmpty(evaluation.getOutEva())) {
             return null;
         }
-        if(StringUtil.isNullOrEmpty(evaluation.getUsername())){
+        if (StringUtil.isNullOrEmpty(evaluation.getUsername())) {
             return null;
         }
-        if(StringUtil.isNullOrEmpty(evaluation.getProjectName())){
+        if (StringUtil.isNullOrEmpty(evaluation.getProjectName())) {
             return null;
         }
         String uuid = UUIDUtil.getUUID();
@@ -51,14 +52,14 @@ public class EvaluationServiceImpl implements EvaluationService {
 
     @Override
     public void update(Evaluation evaluation) {
-        Evaluation evaluation1 = evaluationDao.findByUsernameAndIdNot(evaluation.getUsername(),evaluation.getId());
-        if(evaluation1!=null){
+        Evaluation evaluation1 = evaluationDao.findByUsernameAndIdNot(evaluation.getUsername(), evaluation.getId());
+        if (evaluation1 != null) {
             return;
         }
-        if(StringUtil.isNullOrEmpty(evaluation.getInEva())) {
+        if (StringUtil.isNullOrEmpty(evaluation.getInEva())) {
             return;
         }
-        if(StringUtil.isNullOrEmpty(evaluation.getOutEva())) {
+        if (StringUtil.isNullOrEmpty(evaluation.getOutEva())) {
             return;
         }
         evaluationDao.save(evaluation);
@@ -73,14 +74,14 @@ public class EvaluationServiceImpl implements EvaluationService {
     @Override
     public Page<Evaluation> findSearch(Map searchMap, int page, int size) {
         Specification<Evaluation> specification = createSpecification(searchMap);
-        PageRequest pageRequest = PageRequest.of(page - 1, size, Sort.Direction.DESC,"createDate");
+        PageRequest pageRequest = PageRequest.of(page - 1, size, Sort.Direction.DESC, "createDate");
         return evaluationDao.findAll(specification, pageRequest);
     }
 
     @Override
     public Evaluation findById(String id) {
         Optional<Evaluation> evaluation = evaluationDao.findById(id);
-        if(evaluation.isPresent()){
+        if (evaluation.isPresent()) {
             return evaluation.get();
         }
         return null;
@@ -89,14 +90,13 @@ public class EvaluationServiceImpl implements EvaluationService {
     @Override
     public Evaluation findByName(String name) {
         Evaluation evaluation = evaluationDao.findByUsernameAndMaxCreateDate(name);
-        if(evaluation!=null){
+        if (evaluation != null) {
             return evaluation;
         }
         return null;
     }
 
 
-
     /**
      * 动态条件构建
      *