mcj:更新excel导入导出

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

@@ -26,7 +26,7 @@ public class Browser {
      * 兼容的浏览器
      */
     @ApiModelProperty(value = "兼容的浏览器")
-    private List<CompatibleBrowser> compatibleBrowsers = new ArrayList<>();
+    private List<BaseDes> compatibleBrowsers = new ArrayList<>();
     /**
      * 浏览器插件
      */

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

@@ -366,11 +366,18 @@ public class ExcelUtil {
         reform.setDatabase(database1);
 
         Browser browser = new Browser();
-        List<CompatibleBrowser> compatibleBrowsers = new ArrayList<>();
+        List<BaseDes> compatibleBrowsers = new ArrayList<>();
         for (int i = 93; i <= 97; i++) {
             String brows = getExcelCell(i, 2, sheetAt);
+            String version = getExcelCell(i, 3, sheetAt);
+            String remark = getExcelCell(i, 4, sheetAt);
             CompatibleBrowser name = CompatibleBrowser.getByName(brows);
-            compatibleBrowsers.add(name);
+            BaseDes baseDes = new BaseDes();
+            baseDes.setName(name.toString());
+            baseDes.setCode(name.getCode());
+            baseDes.setVersion(version);
+            baseDes.setDes(remark);
+            compatibleBrowsers.add(baseDes);
 
         }
         browser.setCompatibleBrowsers(compatibleBrowsers);
@@ -527,7 +534,7 @@ public class ExcelUtil {
             browserTemp.setName("前端浏览器相关");
             List<ExcelDataEntity> browserList = browserTemp.getArrayList();
             Browser browser = reform.getBrowser();
-            for (CompatibleBrowser compatibleBrowser : browser.getCompatibleBrowsers()) {
+            for (BaseDes compatibleBrowser : browser.getCompatibleBrowsers()) {
                 browserList.add(exportEntity("原兼容的浏览器", compatibleBrowser.getName()));
             }
             for (BaseDes browserPlug : browser.getBrowserPlugs()) {

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

@@ -51,8 +51,9 @@ public class WorkLoadUtil {
         Browser browser = reform.getBrowser();
         if(browser!=null) {
             //如果原浏览器包含IE，+10
-            List<CompatibleBrowser> compatibleBrowsers = browser.getCompatibleBrowsers();
-            if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+            List<BaseDes> compatibleBrowsers = browser.getCompatibleBrowsers();
+            List<String> names = compatibleBrowsers.stream().map(BaseDes::getName).collect(Collectors.toList());
+            if (!names.isEmpty()&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT.toString())) {
                 score += 10;
                 logger.info("包含IE+10：" + score);
             }
@@ -291,9 +292,10 @@ public class WorkLoadUtil {
                 (1.0+(browserDifficulty.getMedia()!=null&&browserDifficulty.getMedia()==1?1.0:0)/100)*
                 (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();
+        List<BaseDes> compatibleBrowsers = reform.getBrowser().getCompatibleBrowsers();
+        List<String> names = compatibleBrowsers.stream().map(BaseDes::getName).collect(Collectors.toList());
         //if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
-        if (compatibleBrowsers==null||!compatibleBrowsers.contains(CompatibleBrowser.FIREFOX)) {
+        if (names.isEmpty()||!compatibleBrowsers.contains(CompatibleBrowser.FIREFOX.toString())) {
             eBrowser*=1.1;
             logger.info("浏览器难度包含IE");
         }