mcj:更新excel导入导出

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

@@ -36,12 +36,12 @@ public class Details {
      * 台数
      */
     @ApiModelProperty(value = "台数")
-    private Integer num;
+    private String num;
     /**
      * CPU核数
      */
     @ApiModelProperty(value = "CPU核数")
-    private Integer cpuNum;
+    private String cpuNum;
     /**
      * 单核主频
      */
@@ -51,7 +51,7 @@ public class Details {
      * 服务器总空间
      */
     @ApiModelProperty(value = "服务器总空间")
-    private double space;
+    private String space;
     /**
      * 其他
      */

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

@@ -188,9 +188,9 @@ public class Reform {
     @ApiModelProperty(value = "迁移策略",example = "1")
     private Integer strategy = -1;
     @ApiModelProperty(value = "RTO")
-    private Integer rto;
+    private Integer rto = -1;
     @ApiModelProperty(value = "RPO")
-    private Integer rpo;
+    private Integer rpo = -1;
     /**
      * 额外申请
      */

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

@@ -63,12 +63,13 @@ public class BudgetUitl {
         inspectParameter.setMoneyRate(Double.valueOf(doubleHashMap.get(1)));
         Double moneyRate = inspectParameter.getMoneyRate();
         System.out.println(JSON.toJSONString("inspectParameter:"+inspectParameter));
-        int mouth = inspectParameter.getYears();
+        int year = inspectParameter.getYears();
         if(inspectParameter.getYears()==-1){
-            mouth=1;
+            year=1;
         }
-        double pow = Math.pow(moneyRate, mouth);
-
+        double pow = Math.pow(moneyRate, year);
+        BigDecimal.valueOf(pow);
+        double v =  pow+1D;
         //带修正系数资金
         ArrayList<String> strings = new ArrayList<>();
         strings.add("安全能力");

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

@@ -82,8 +82,7 @@ public class ExcelUtil {
         String cycle = getExcelCell(5, 2, sheetAt);
         String s = cycle.replaceAll("年", "");
 
-        reform.setCycle(returnNum(s) * 12);
-
+        reform.setCycle(returnNum(s));
         String time = getExcelCell(6, 2, sheetAt);
         if (!"".equals(time)) {
             if ("10年以上".equals(time)) {
@@ -175,7 +174,7 @@ public class ExcelUtil {
 
 
         List<BaseDes> fontTechnologies = new ArrayList<>();
-        for (int i = 22; i < 27; i++) {
+        for (int i = 22; i < 28; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
             if ("".equals(framework)) {
                 continue;
@@ -192,10 +191,10 @@ public class ExcelUtil {
                 fontTechnologies.add(font);
             }
         }
-        developLanguageSystem.setFontDevTechnologies(fontTechnologies);
 
-        List<BaseDes> fontDevTechnologies = new ArrayList<>();
-        for (int i = 28; i < 33; i++) {
+        developLanguageSystem.setFontDevTechnologies(fontTechnologies);
+        ArrayList<BaseDes> fontDevTechnologies = new ArrayList<BaseDes>();
+        for (int i = 28; i < 34; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
             if ("".equals(framework)) {
                 continue;
@@ -214,6 +213,7 @@ public class ExcelUtil {
         }
         developLanguageSystem.setCsDevTechnologies(fontDevTechnologies);
 
+
         List<BaseDes> opGAS = new ArrayList<>();
         for (int i = 34; i < 39; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
@@ -276,7 +276,7 @@ public class ExcelUtil {
         middleware.setMiddlewareEnums(middlewareEnums);
 
         ArrayList<OtherApi> otherApis = new ArrayList<>();
-        for (int i = 51; i < 61; i++) {
+        for (int i = 51; i < 62; i++) {
             String api = getExcelCell(i, 2, sheetAt);
             if ("".equals(api)) {
                 continue;
@@ -293,7 +293,7 @@ public class ExcelUtil {
         middleware.setOtherApis(otherApis);
 
         List<BaseDes> microServices = new ArrayList<>();
-        for (int i = 62; i < 72; i++) {
+        for (int i = 62; i < 73; i++) {
             String name = getExcelCell(i, 2, sheetAt);
             if (name == null || "".equals(name)) {
                 continue;
@@ -402,6 +402,9 @@ public class ExcelUtil {
         browser.setBrowserPlugs(browserPlugs);
         reform.setBrowser(browser);
 
+        String excelCell = getExcelCell(108, 2, sheetAt);
+
+
         String apply = getExcelCell(110, 2, sheetAt);
         Apply apply1 = new Apply();
         apply1.setCost(Double.valueOf(apply));
@@ -428,6 +431,9 @@ public class ExcelUtil {
         Details vpsdetails = getSysDetails(118, 2, sheetAt);
         systemStructure.setVps(vpsdetails);
 
+        Details otherEquipment = getSysDetails(119, 2, sheetAt);
+        systemStructure.setOtherEquipment(otherEquipment);
+
         reform.setSystemStructure(systemStructure);
 
         String rpo = getExcelCell(121, 2, sheetAt);
@@ -612,6 +618,8 @@ public class ExcelUtil {
                 return "单机运行";
             case 4:
                 return "分布式";
+            default:
+                break;
         }
         return "";
     }
@@ -667,7 +675,7 @@ public class ExcelUtil {
 
     private static int returnNum(String target) {
         if (!"".equals(target)) {
-            return Integer.valueOf(target);
+            return Integer.parseInt(target);
         } else {
             return 0;
         }
@@ -675,7 +683,7 @@ public class ExcelUtil {
 
     private static double returnDouble(String target) {
         if (!"".equals(target)) {
-            return Double.valueOf(target);
+            return Double.parseDouble(target);
         } else {
             return 0;
         }
@@ -715,18 +723,21 @@ public class ExcelUtil {
             details.setDeploy(2);
         }
         String num3 = getExcelCell(rowNum, cellNum + 1, sheetAt);
-        details.setNum(returnNum(num3));
+        details.setNum(num3);
 
         String slbsys = getExcelCell(rowNum, cellNum + 2, sheetAt);
         OperateSystem slbByName = OperateSystem.getByName(slbsys);
         details.setOperateSystem(slbByName);
         details.setCode(slbByName.getCode());
         String cpu3 = getExcelCell(rowNum, cellNum + 3, sheetAt);
-        details.setCpuNum(returnNum(cpu3));
+        details.setCpuNum(cpu3);
         String ghz3 = getExcelCell(rowNum, cellNum + 4, sheetAt);
         details.setGhz(ghz3);
-        String space3 = getExcelCell(rowNum, cellNum + 5, sheetAt);
-        details.setSpace(returnDouble(space3));
+        String memory = getExcelCell(rowNum, cellNum + 5, sheetAt);
+        details.setMemory(memory);
+        String space3 = getExcelCell(rowNum, cellNum + 6, sheetAt);
+        details.setSpace(space3);
+
         return details;
     }