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

src/main/java/com/zjty/inspect/config/ExceptionHandlerConfig.java

+package com.zjty.inspect.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author Mcj
+ * @date 2020-03-16 10:33
+ */
+@ControllerAdvice
+@Slf4j
+public class ExceptionHandlerConfig {
+
+    @ExceptionHandler(value = HttpMessageNotReadableException.class)
+    public ResponseEntity defaultErrorHandler(Exception e) {
+        log.error("异常{}",e);
+        return ResponseEntity.badRequest().build();
+    }
+    @ExceptionHandler(value = IOException.class)
+    public ResponseEntity defaultIOHandler(Exception e) {
+        log.error("IO异常{}",e);
+        return ResponseEntity.status(500).build();
+    }
+}

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

@@ -35,7 +35,7 @@ public class InspectParameter {
     private Double proportion;
 
     /**
-     * 年利率
+     * 利率
      */
     private Double moneyRate;
 

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

@@ -13,30 +13,18 @@ public enum Language {
      */
     JAVA("java",1),
 
-
-    VUE("js",2),
-
     PYTHON("python",3),
 
-    ASP("asp",4),
-    /**
-     * js
-     */
     JAVASCRIPT("js",5),
-    /**
-     * go
-     */
+
     GO("go",6),
 
-    /**
-     * html
-     */
     HTML("html",7),
 
     C井("c#",8),
 
-
     C("c++",9),
+
     UNKNOW("unknowun",10);
 
 
@@ -56,9 +44,4 @@ public enum Language {
     public Integer getStatus() {
         return status;
     }
-
-    public static void main(String[] args) {
-        Language language = Language.valueOf("VUE");
-        System.out.println(language.name);
-    }
 }

src/main/java/com/zjty/inspect/service/InspectService.java

@@ -4,6 +4,7 @@ import com.zjty.inspect.entity.InspectParameter;
 import com.zjty.inspect.entity.Report;
 import com.zjty.inspect.entity.ReportVo;
 
+import java.io.IOException;
 import java.util.Map;
 
 public interface InspectService {
@@ -12,7 +13,7 @@ public interface InspectService {
      * @param inspectParameter
      * @return
      */
-    ReportVo inspect(ReportVo reportVo,InspectParameter inspectParameter);
+    ReportVo inspect(ReportVo reportVo,InspectParameter inspectParameter) throws IOException;
     String generateHtml(String templateContent, Map model );
 
 

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

@@ -21,6 +21,7 @@ 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;
 import java.util.Map;
@@ -45,7 +46,7 @@ public class InspectServiceImpl implements InspectService {
 
     @Transactional
     @Override
-    public ReportVo inspect(ReportVo reportVo,InspectParameter inspectParameter) {
+    public ReportVo inspect(ReportVo reportVo,InspectParameter inspectParameter) throws IOException {
         //统计文件后缀数量
         Map<String, Language> suffixLanguageMapping = new HashMap<>();
         suffixLanguageMapping.put("java", Language.JAVA);

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

@@ -290,7 +290,8 @@ public class WorkLoadUtil {
                 (1.0+(browserDifficulty.getFlash()!=null&&browserDifficulty.getFlash()==1?1.0:0)/100)*
                 (1.0+(browserDifficulty.getOtherDemand()!=null&&browserDifficulty.getOtherDemand()==1?1.0:0)/100);
         List<CompatibleBrowser> compatibleBrowsers = reform.getBrowser().getCompatibleBrowsers();
-        if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+        //if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+        if (compatibleBrowsers==null||!compatibleBrowsers.contains(CompatibleBrowser.FIREFOX)) {
             eBrowser*=1.1;
             logger.info("浏览器难度包含IE");
         }