提交 c5c7de96 authored 作者: 马晨俊's avatar 马晨俊

mcj:注释生成模版代码

上级 caa50a9a
...@@ -73,9 +73,7 @@ public class InspectController { ...@@ -73,9 +73,7 @@ public class InspectController {
if(inspectParameter==null){ if(inspectParameter==null){
inspectParameter = new InspectParameter(); inspectParameter = new InspectParameter();
inspectParameter.setUsername(username); inspectParameter.setUsername(username);
inspectParameter.setSourceAddress(file.getCanonicalPath());
inspectParameter.setSystemFund(systemFund); inspectParameter.setSystemFund(systemFund);
inspectParameter.setAdmin(admin);
inspectParameter.setModules(modules); inspectParameter.setModules(modules);
inspectParameter.setSafety(safety); inspectParameter.setSafety(safety);
inspectParameter.setTables(tables); inspectParameter.setTables(tables);
...@@ -84,10 +82,11 @@ public class InspectController { ...@@ -84,10 +82,11 @@ public class InspectController {
inspectParameter.setDisaster(disaster); inspectParameter.setDisaster(disaster);
inspectParameter.setData(data); inspectParameter.setData(data);
inspectParameter.setFramework(framework); inspectParameter.setFramework(framework);
inspectParameter.setPath(file.getCanonicalPath());
inspectParameter.setRecastMethod(method);
inspectParameter.setId(UUIDUtil.getUUID()); inspectParameter.setId(UUIDUtil.getUUID());
inspectParameter.setAdmin(admin);
} }
inspectParameter.setRecastMethod(method);
inspectParameter.setSourceAddress(file.getCanonicalPath());
ReportVo reportVo = new ReportVo(); ReportVo reportVo = new ReportVo();
int count = technologyService.findAllTechnologyCount(); int count = technologyService.findAllTechnologyCount();
reportVo.setTechnologiesNum(count); reportVo.setTechnologiesNum(count);
......
...@@ -91,11 +91,6 @@ public class InspectParameter { ...@@ -91,11 +91,6 @@ public class InspectParameter {
*/ */
private Integer disaster; private Integer disaster;
/**
* git地址
*/
private String path;
/** /**
* null:无效 * null:无效
*/ */
......
...@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.*; import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
...@@ -146,6 +147,12 @@ public class Inspector { ...@@ -146,6 +147,12 @@ public class Inspector {
//统计项目组成文件构成 //统计项目组成文件构成
//统计配置文件地址 //统计配置文件地址
statisticsConfigFile(); statisticsConfigFile();
//根据后缀名,收集文件进行操作
for (Rule rule : ruleList) {
if (!ruleSuffixFileMap.containsKey(rule.getSuffix())) {
ruleSuffixFileMap.put(rule.getSuffix(), new ArrayList<>());
}
}
try { try {
//以下为计算文件名称匹配正则表达式 //以下为计算文件名称匹配正则表达式
FileSystem aDefault = FileSystems.getDefault(); FileSystem aDefault = FileSystems.getDefault();
...@@ -165,7 +172,7 @@ public class Inspector { ...@@ -165,7 +172,7 @@ public class Inspector {
ruleSuffix.put(aDefault.getPathMatcher("glob:**/*." + s), s); ruleSuffix.put(aDefault.getPathMatcher("glob:**/*." + s), s);
} }
//文件读取 //文件读取
Files.walkFileTree(Paths.get(inspectParameter.getPath()), new FileVisitor<Path>() { Files.walkFileTree(Paths.get(inspectParameter.getSourceAddress()), new FileVisitor<Path>() {
@Override @Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
//这里是对于路径(文件夹)的过滤,在这里读不到文件如果能判断,可以返回FileVisitResult.SKIP_SUBTREE 不访问子目录 //这里是对于路径(文件夹)的过滤,在这里读不到文件如果能判断,可以返回FileVisitResult.SKIP_SUBTREE 不访问子目录
...@@ -176,7 +183,6 @@ public class Inspector { ...@@ -176,7 +183,6 @@ public class Inspector {
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
for (Map.Entry<String, PathMatcher> entry : languageSuffixMatcherMapping.entrySet()) { for (Map.Entry<String, PathMatcher> entry : languageSuffixMatcherMapping.entrySet()) {
//通过正则表达式匹配.java类型后缀文件,并+1 //通过正则表达式匹配.java类型后缀文件,并+1
if (entry.getValue().matches(file)) { if (entry.getValue().matches(file)) {
......
...@@ -43,15 +43,14 @@ public class FileUtil { ...@@ -43,15 +43,14 @@ public class FileUtil {
// MultipartFile to File // MultipartFile to File
multipartFile.transferTo(excelFile); multipartFile.transferTo(excelFile);
if(prefix.equals(".zip")){ if(prefix.equals(".zip")){
FileUtil.unPackZip(excelFile,"", ".././"+name+"/"+split1[0]); FileUtil.unPackZip(excelFile,"", "./"+name+"/"+split1[0]);
}else{ }else{
FileUtil.unPackRar(excelFile, ".././"+name+"/"+split1[0]); FileUtil.unPackRar(excelFile, "./"+name+"/"+split1[0]);
} }
String[] split = fileName.split("\\."); String[] split = fileName.split("\\.");
File file3 = new File(".././"+name+"/"+split1[0]+"/"+split[0]); File file3 = new File("./"+name+"/"+split1[0]+"/"+split[0]);
excelFile.delete(); excelFile.delete();
log.info("end unpack file"); log.info("end unpack file");
System.out.println(file3.getCanonicalPath());
return file3; return file3;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论