zs

src/main/java/com/zjty/adaptationmaster/adaptor/entity/Report.java

 package com.zjty.adaptationmaster.adaptor.entity;
 
 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.ProjectPom;
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
-import com.zjty.adaptationmaster.utils.Assessor;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.PomDependency;
 import com.zjty.adaptationmaster.utils.Inspector;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.nio.file.Path;
 import java.util.List;
 
 @Data
@@ -23,7 +21,7 @@ public class Report {
     private DatabaseType databaseType;//数据库类型
     private int fileNum;
     private long lineNum;
-    private List<Dependency> dependencies;
+    private List<PomDependency> dependencies;
     @Transient
     private ProjectPom projectPom;
 

src/main/java/com/zjty/adaptationmaster/adaptor/entity/ReportEntity.java

 package com.zjty.adaptationmaster.adaptor.entity;
 
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
-import com.zjty.adaptationmaster.utils.Inspector;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
-import java.util.List;
 
 /**
  * 返回

src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/PomAnalysis.java

 package com.zjty.adaptationmaster.adaptor.entity.pomEntity;
 
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.PomDependency;
 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Parent;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -36,7 +36,7 @@ public class PomAnalysis {
     //private List<Module> modules;//模块（有时称作子项目） 被构建成项目的一部分。列出的每个模块元素是指向该模块的目录的相对路径
     //private List<Repository> repositories;//发现依赖和扩展的远程仓库列表
     //private List<PluginRepository> pluginRepositiries;//发现插件的远程仓库列表，这些插件用于构建和报表
-    private List<Dependency> dependencies;
+    private List<PomDependency> dependencies;
     //private Repoting repoting;//该元素描述使用报表插件产生报表的规范。当用户执行“mvn site”，这些报表就会运行。 在页面导航栏能看到所有报表的链接
     //private DependencyManagement dependencyManagement;//继承自该项目的所有子项目的默认依赖信息。这部分的依赖信息不会被立即解析,而是当子项目声明一个依赖（必须描述group ID和artifact ID信息），如果group ID和artifact ID以外的一些信息没有描述，则通过group ID和artifact ID匹配到这里的依赖，并使用这里的依赖信息
     //private DistributionManagement distributionManagement;//项目分发信息，在执行mvn deploy后表示要发布的位置。有了这些信息就可以把网站部署到远程服务器或者把构件部署到远程仓库

src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/ProjectPom.java

@@ -4,8 +4,6 @@ import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import java.util.List;
 
 @NoArgsConstructor
@@ -36,7 +34,7 @@ public class ProjectPom {
     //private List<Module> modules;//模块（有时称作子项目） 被构建成项目的一部分。列出的每个模块元素是指向该模块的目录的相对路径
     //private List<Repository> repositories;//发现依赖和扩展的远程仓库列表
     //private List<PluginRepository> pluginRepositiries;//发现插件的远程仓库列表，这些插件用于构建和报表
-    private List<Dependency> dependencies;
+    private List<PomDependency> dependencies;
     //private Repoting repoting;//该元素描述使用报表插件产生报表的规范。当用户执行“mvn site”，这些报表就会运行。 在页面导航栏能看到所有报表的链接
     //private DependencyManagement dependencyManagement;//继承自该项目的所有子项目的默认依赖信息。这部分的依赖信息不会被立即解析,而是当子项目声明一个依赖（必须描述group ID和artifact ID信息），如果group ID和artifact ID以外的一些信息没有描述，则通过group ID和artifact ID匹配到这里的依赖，并使用这里的依赖信息
     //private DistributionManagement distributionManagement;//项目分发信息，在执行mvn deploy后表示要发布的位置。有了这些信息就可以把网站部署到远程服务器或者把构件部署到远程仓库

src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/SecondFloor/Dependency.java → src/main/java/com/zjty/adaptationmaster/adaptor/entity/pomEntity/SecondFloor/PomDependency.java

@@ -4,15 +4,17 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import java.util.List;
 
 @Entity
 @NoArgsConstructor
 @Data
-public class Dependency {
+public class PomDependency {
 
     @Id
+    @GeneratedValue
     private int id;
     private String groupId;
     private String artifactId;
@@ -61,6 +63,6 @@ public class Dependency {
 //    }
 
 
-    //private List<Dependency> parentDependencies;//
+    //private List<PomDependency> parentDependencies;//
     //private int reportId;
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/InspectServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Report;
 import com.zjty.adaptationmaster.adaptor.entity.ReportEntity;
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.PomDependency;
 import com.zjty.adaptationmaster.adaptor.repository.ProjectDao;
 import com.zjty.adaptationmaster.adaptor.repository.ReportDao;
 import com.zjty.adaptationmaster.adaptor.service.InspectService;
@@ -53,7 +53,7 @@ public class InspectServiceImpl implements InspectService {
             reportEntity.setLanguage(report.getLanguage());
             reportEntity.setPackagePath(report.getPackagePath());
 
-            List<Dependency> dependencies = report.getDependencies();
+            List<PomDependency> dependencies = report.getDependencies();
             String s = JSON.toJSONString(dependencies);
             List<Inspector.Warn> warnList = report.getWarnList();
             String s1 = JSON.toJSONString(warnList);
@@ -82,7 +82,7 @@ public class InspectServiceImpl implements InspectService {
         ReportEntity one = reportDao.getOne(id);
         Report report = new Report();
         report.setId(one.getId());
-        List<Dependency> dependencies = JSON.parseArray(one.getDependence(), Dependency.class);
+        List<PomDependency> dependencies = JSON.parseArray(one.getDependence(), PomDependency.class);
         report.setDependencies(dependencies);
         report.setDatabaseType(one.getDatabaseType());
         report.setLanguage(one.getLanguage());

src/main/java/com/zjty/adaptationmaster/utils/AnalysisPom.java

 package com.zjty.adaptationmaster.utils;
 
 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.ProjectPom;
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.PomDependency;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -9,8 +9,8 @@ import java.util.List;
 
 public class AnalysisPom {
     public static ProjectPom analysis(Path pomPath){
-        List<Dependency> dependencies = new ArrayList<>();
-        Dependency dependency = new Dependency();
+        List<PomDependency> dependencies = new ArrayList<>();
+        PomDependency dependency = new PomDependency();
         dependency.setGroupId("aaa.bbb");
         dependency.setArtifactId("ccc.ddd");
         dependency.setVersion("1.0.0");

src/main/java/com/zjty/adaptationmaster/utils/Inspector.java

@@ -4,7 +4,7 @@ import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Report;
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
 import com.zjty.adaptationmaster.adaptor.entity.pomEntity.ProjectPom;
-import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.Dependency;
+import com.zjty.adaptationmaster.adaptor.entity.pomEntity.SecondFloor.PomDependency;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -239,7 +239,7 @@ public class Inspector {
          * 对于具体的配置文件对应的处理方法
          * 增加要处理的文件类型需要在这里增加相应的处理方法
          */
-        ArrayList<Dependency> dependencies1 = new ArrayList<>();
+        ArrayList<PomDependency> dependencies1 = new ArrayList<>();
 
         for(Map.Entry<String,List<Path>> entry:configFileTypePathsMapping.entrySet()){
             //System.out.println(entry.getKey());
@@ -260,7 +260,7 @@ public class Inspector {
                             //解析pom文件
                             ProjectPom analysis = AnalysisPom.analysis(path);
                             //设置依赖
-                            List<Dependency> dependencies = analysis.getDependencies();
+                            List<PomDependency> dependencies = analysis.getDependencies();
                             dependencies1.addAll(dependencies);
 
                             SAXReader reader = new SAXReader();