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

src/main/java/com/zjty/inspect/controller/InspectController.java

@@ -127,6 +127,8 @@ public class InspectController {
     @PostMapping("/rapidAssessment")
     public ResponseEntity rapidAssessment(@RequestBody Reform reform){
         System.out.println(JSON.toJSONString(reform));
+        //输入参数
+        String in = JSON.toJSONString(reform);
         InspectParameter inspectParameter = new InspectParameter();
         inspectParameter.setUsername(reform.getUsername());
         inspectParameter.setValid("1");
@@ -346,8 +348,7 @@ public class InspectController {
         System.out.println("F:"+f);
         workLoadUtil.result(reform, assessmentReport, f, 1.5);
         Evaluation evaluation=new Evaluation();
-        //输入参数
-        String in = JSON.toJSONString(reform);
+
         //输出参数
         String out = JSON.toJSONString(assessmentReport);
 

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

@@ -29,7 +29,7 @@ public class SystemStructure {
     /**
      * SLB
      */
-    private Details SLB;
+    private Details slb;
 
     /**
      * 存储

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

@@ -7,7 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.math.RoundingMode;
+import java.text.FieldPosition;
 import java.text.NumberFormat;
+import java.text.ParsePosition;
 import java.util.List;
 import java.util.Objects;
 
@@ -231,6 +233,7 @@ public class WorkLoadUtil {
     //r:人工费
     public void result(Reform reform,AssessmentReport report,double f,double r){
         NumberFormat nf = NumberFormat.getInstance();
+        nf.setGroupingUsed(false);
         nf.setMaximumFractionDigits(3);
         //nf.setRoundingMode(RoundingMode.HALF_UP);
         double calculate = 0;//calculate(reform);
@@ -444,6 +447,15 @@ public class WorkLoadUtil {
     }
 
     public static void main(String[] args) {
+        if(true) {
+            NumberFormat nf = NumberFormat.getInstance();
+            nf.setGroupingUsed(false);
+            nf.setMaximumFractionDigits(3);
+            System.out.println(nf.format(1000));
+            System.out.println(Double.valueOf("10000"));
+            System.out.println(Double.valueOf(nf.format(10000)));
+            return;
+        }
         WorkLoadUtil workLoadUtil = new WorkLoadUtil();
         String reform = "{\n" +
                 "\t\"mode\":1,\n" +