mcj:更新reportVo

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

@@ -3,10 +3,7 @@ package com.zjty.inspect.controller;
 import com.zjty.inspect.entity.InspectParameter;
 import com.zjty.inspect.entity.ReportVo;
 import com.zjty.inspect.service.InspectService;
-import com.zjty.inspect.utils.FileUtil;
-import com.zjty.inspect.utils.GitLabUtil;
-import com.zjty.inspect.utils.MavenUtil;
-import com.zjty.inspect.utils.UUIDUtil;
+import com.zjty.inspect.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
@@ -68,6 +65,9 @@ public class InspectController {
         inspectParameter.setPath(file.getCanonicalPath());
         inspectParameter.setId(UUIDUtil.getUUID());
         ReportVo reportVo = new ReportVo();
+
+
+        reportVo.setId(TimeUtil.getNowDate());
         reportVo.setUploadType("文件上传");
         reportVo.setFileName(fileName);
         reportVo.setProjectName(projectName);

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

@@ -14,6 +14,7 @@ import java.util.List;
 @Data
 public class ReportVo {
 
+    private String id;
     /**
      * 文件名称
      */
@@ -84,6 +85,7 @@ public class ReportVo {
      */
     private List<Technology> technologies;
 
+    private HashMap<String,Technology> technologyNameMap = new HashMap<>();
     /**
      * 告警点
      */

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

@@ -344,6 +344,7 @@ public class Inspector {
         HashMap<String, List<Warn>> warnMap = getWarnMap(map);
         ruleDao.saveAll(rules);
         report.setWarnDetails(warnMap);
+        report.setTechnologyNameMap(map);
         return report;
     }
 
@@ -421,12 +422,12 @@ public class Inspector {
     private HashMap<String, List<Warn>> getWarnMap(HashMap<String, Technology> map) {
         HashMap<String, List<Warn>> warnMap = new HashMap<>();
         for (Warn warn : warns) {
-            if (!warnMap.containsKey(map.get(warn.getTechnologyId()).getTechnologyName())) {
+            if (!warnMap.containsKey(warn.getTechnologyId())) {
                 ArrayList<Warn> warns1 = new ArrayList<>();
                 warns1.add(warn);
-                warnMap.put(map.get(warn.getTechnologyId()).getTechnologyName(), warns1);
+                warnMap.put(warn.getTechnologyId(), warns1);
             } else {
-                warnMap.get(map.get(warn.getTechnologyId()).getTechnologyName()).add(warn);
+                warnMap.get(warn.getTechnologyId()).add(warn);
             }
         }
         return warnMap;

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

@@ -4,7 +4,24 @@ import java.time.LocalDateTime;
 
 public class TimeUtil {
     public static String getNowDate(){
+        StringBuilder stringBuilder = new StringBuilder();
+        String uuid = UUIDUtil.getUUID();
+        String[] split = uuid.split("-");
         LocalDateTime date = LocalDateTime.now();
-        return date.getHour() + ":" + date.getMinute() +  ":" + date.getSecond();
+        stringBuilder.append(date.getYear())
+                .append(date.getMonth())
+                .append(date.getDayOfMonth())
+                .append(date.getHour() )
+                .append(date.getMinute())
+                .append(date.getSecond())
+                .append(split[0]);
+
+        return stringBuilder.toString();
+
+    }
+
+    public static void main(String[] args) {
+        String nowDate = TimeUtil.getNowDate();
+        System.out.println(nowDate);
     }
 }