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

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.tomcat.util.http.fileupload.disk.DiskFileItem;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -384,8 +385,12 @@ public class InspectController {
         }
     }
     @PostMapping("/gitdownload")
-    private ResponseEntity gitDownloads(String gitAddress,String username,String password){
-        String gitPath = GitLabUtil.downLoadProject(gitAddress,username,password);
-        return ResponseEntity.ok(gitPath);
+    private ResponseEntity gitDownloads(String gitAddress,String username,String password)  {
+        try {
+            String gitPath = GitLabUtil.downLoadProject(gitAddress,username,password);
+            return ResponseEntity.ok(gitPath);
+        }catch (Exception e){
+            return ResponseEntity.status(400).build();
+        }
     }
 }

src/main/java/com/zjty/inspect/inspect/Inspector.java

@@ -581,6 +581,27 @@ public class Inspector {
             }
             dependency.setSupport(1);
         } else {
+            Rule rule = new Rule();
+            rule.setTechnologyId(techUnKnowSupport.getId());
+            rule.setTarget(dependency.getGroupId());
+            rule.setTechnologyName(techUnKnowSupport.getTechnologyName());
+            rule.setSuffix("*");
+            rule.setId(UUIDUtil.getUUID());
+            Rule rule1 = new Rule();
+            rule1.setTechnologyId(techUnKnowSupport.getId());
+            rule1.setTarget(dependency.getArtifactId());
+            rule1.setTechnologyName(techUnKnowSupport.getTechnologyName());
+            rule1.setSuffix("*");
+            rule1.setId(UUIDUtil.getUUID());
+            if (!ruleMap.containsKey(dependency.getGroupId() + ":" + rule.getSuffix())) {
+                rules.add(rule);
+                ruleMap.put(dependency.getGroupId() + ":" + rule.getSuffix(), rule);
+            }
+            if (!ruleMap.containsKey(dependency.getArtifactId() + ":" + rule1.getSuffix())) {
+                rules.add(rule1);
+                ruleMap.put(dependency.getArtifactId() + ":" + rule1.getSuffix(), rule1);
+            }
+
             int i = valiWarn(ruleList, path, stringBuilder.toString(), 0);
             dependency.setSupport(i);
         }

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

@@ -17,28 +17,18 @@ import java.time.LocalDate;
 @Component
 public class GitLabUtil {
 
-    public static String downLoadProject(String path,String username,String password) {
+    public static String downLoadProject(String path, String username, String password) throws IOException, GitAPIException {
         String name1 = LocalDate.now().toString();
         String[] split1 = UUIDUtil.getUUID().split("-");
         //String REMOTE_URL = "https://git.yfzx.zjtys.com.cn:8888/912-system/monitor/adaptation-master.git";
         CloneCommand cloneCommand = Git.cloneRepository();
         cloneCommand.setURI(path);
-        File file = new File("./"+name1+"/"+split1[0]+"/");
+        File file = new File("./" + name1 + "/" + split1[0] + "/");
         file.mkdirs();
         cloneCommand.setDirectory(file);
-        cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username,password));
-        try {
-
-            cloneCommand.call();
-        } catch (GitAPIException e) {
-            e.printStackTrace();
-        }
-        try {
-            return file.getCanonicalPath();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return file.getAbsolutePath();
+        cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, password));
+        cloneCommand.call();
+        return file.getCanonicalPath();
     }
 
 }

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" +