mcj:更新excel导入导出

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

@@ -27,7 +27,7 @@ public class Middleware {
      * 原文件情况 枚举
      */
     @ApiModelProperty(value = "原文件情况")
-    private List<MiddlewareEnum> middlewareEnums = new ArrayList<>();
+    private List<BaseDes> middlewareEnums = new ArrayList<>();
     /**
      * 原应用第三方api
      */

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

@@ -263,13 +263,20 @@ public class ExcelUtil {
          * 中间件/API
          */
         Middleware middleware = new Middleware();
-        List<MiddlewareEnum> middlewareEnums = new ArrayList<>();
+        List<BaseDes> middlewareEnums = new ArrayList<>();
         for (int i = 46; i < 51; i++) {
             String middleware1 = getExcelCell(i, 2, sheetAt);
+            String version = getExcelCell(i, 3, sheetAt);
+            String remark = getExcelCell(i, 4, sheetAt);
             if (!"".equals(middleware1)) {
                 MiddlewareEnum middlewareEnum = MiddlewareEnum.getByName(middleware1);
                 if (middlewareEnum != null) {
-                    middlewareEnums.add(middlewareEnum);
+                    BaseDes baseDes = new BaseDes();
+                    baseDes.setDes(remark);
+                    baseDes.setName(middlewareEnum.getName());
+                    baseDes.setCode(middlewareEnum.getCode());
+                    baseDes.setVersion(version);
+                    middlewareEnums.add(baseDes);
                 }
             }
         }
@@ -531,7 +538,7 @@ public class ExcelUtil {
             middleTemp.setName("中间件相关");
             List<ExcelDataEntity> middleList = middleTemp.getArrayList();
             Middleware middleware = reform.getMiddleware();
-            for (MiddlewareEnum middlewareEnum : middleware.getMiddlewareEnums()) {
+            for (BaseDes middlewareEnum : middleware.getMiddlewareEnums()) {
                 middleList.add(exportEntity("原中间件", middlewareEnum.getName()));
             }
             for (OtherApi otherApi : middleware.getOtherApis()) {

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

@@ -12,6 +12,7 @@ import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 应用系统改造替换工作量根据表单计算
@@ -102,11 +103,12 @@ public class WorkLoadUtil {
          */
         Middleware middleware = reform.getMiddleware();
         if(middleware!=null) {
-            List<MiddlewareEnum> middlewareEnums = middleware.getMiddlewareEnums();
+            List<BaseDes> middlewareEnums = middleware.getMiddlewareEnums();
             int effectMidNum = 0;
             if(middlewareEnums!=null) {
                 effectMidNum = middlewareEnums.size();
-                if (middlewareEnums.contains(MiddlewareEnum.TOMCAT)) {
+                List<String> names = middlewareEnums.stream().map(BaseDes::getName).collect(Collectors.toList());
+                if (names.contains(MiddlewareEnum.TOMCAT.getName())) {
                     effectMidNum--;
                 }
             }
@@ -324,12 +326,12 @@ public class WorkLoadUtil {
                 (1.0+(middlewareDifficulty.getRoute()==1?10.0:0)/100);
         Middleware middleware = reform.getMiddleware();
         if(middleware!=null) {
-            List<MiddlewareEnum> middlewareEnums = middleware.getMiddlewareEnums();
+            List<BaseDes> middlewareEnums = middleware.getMiddlewareEnums();
             if(middlewareEnums!=null) {
-                for (MiddlewareEnum middlewareEnum : middlewareEnums) {
-                    if (middlewareEnum != MiddlewareEnum.TOMCAT) {
+                for (BaseDes middlewareEnum : middlewareEnums) {
+                    if (middlewareEnum.getName() != MiddlewareEnum.TOMCAT.getName()) {
                         emiddle *= 1.05;
-                        logger.info("中间件：" + middlewareEnum);
+                        logger.info("中间件：" + middlewareEnum.getName());
                     }
                 }
             }