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

mcj:修复参数bug

上级 7bc5961b
...@@ -68,9 +68,9 @@ public class InspectController { ...@@ -68,9 +68,9 @@ public class InspectController {
File file = FileUtil.saveToLocal(multfile); File file = FileUtil.saveToLocal(multfile);
log.info("inspect:代码解压完成,地址为{}",file.getCanonicalPath()); log.info("inspect:代码解压完成,地址为{}",file.getCanonicalPath());
InspectParameter inspectParameter; InspectParameter inspectParameter = parameterService.getParameterByUsername(username);
InspectParameter parameterByUsername = parameterService.getParameterByUsername(username);
if(parameterByUsername==null){ if(inspectParameter==null){
inspectParameter = new InspectParameter(); inspectParameter = new InspectParameter();
inspectParameter.setUsername(username); inspectParameter.setUsername(username);
inspectParameter.setSourceAddress(file.getCanonicalPath()); inspectParameter.setSourceAddress(file.getCanonicalPath());
...@@ -87,8 +87,6 @@ public class InspectController { ...@@ -87,8 +87,6 @@ public class InspectController {
inspectParameter.setPath(file.getCanonicalPath()); inspectParameter.setPath(file.getCanonicalPath());
inspectParameter.setRecastMethod(method); inspectParameter.setRecastMethod(method);
inspectParameter.setId(UUIDUtil.getUUID()); inspectParameter.setId(UUIDUtil.getUUID());
}else{
inspectParameter=parameterByUsername;
} }
ReportVo reportVo = new ReportVo(); ReportVo reportVo = new ReportVo();
int count = technologyService.findAllTechnologyCount(); int count = technologyService.findAllTechnologyCount();
...@@ -156,12 +154,4 @@ public class InspectController { ...@@ -156,12 +154,4 @@ public class InspectController {
ReportVo inspect = inspectService.inspect(reportVo, inspectParameter); ReportVo inspect = inspectService.inspect(reportVo, inspectParameter);
return ResponseEntity.ok(inspect); return ResponseEntity.ok(inspect);
} }
@PostMapping("/frontend")
@ApiOperation("git下载代码进行评估")
public ResponseEntity inspect(MultipartFile file) throws IOException {
return ResponseEntity.ok(200);
}
} }
...@@ -128,8 +128,11 @@ public class Inspector { ...@@ -128,8 +128,11 @@ public class Inspector {
* FileVisitResult.TERMINATE 中止访问 * FileVisitResult.TERMINATE 中止访问
* FileVisitResult.SKIP_SIBLINGS 不访问同级的文件或目录 * FileVisitResult.SKIP_SIBLINGS 不访问同级的文件或目录
* FileVisitResult.SKIP_SUBTREE 不访问子目录 * FileVisitResult.SKIP_SUBTREE 不访问子目录
* * 准备工作
* @return 报告 * 1.解析文件
* 2/记录文件地址
* 3/统计各个规则文件后缀
* @return
*/ */
public ReportVo inspect() { public ReportVo inspect() {
ruleSuffixFileMap = new HashMap<>(); ruleSuffixFileMap = new HashMap<>();
...@@ -342,9 +345,8 @@ public class Inspector { ...@@ -342,9 +345,8 @@ public class Inspector {
if (inspectParameter.getValid() != null) { if (inspectParameter.getValid() != null) {
BudgetVo budget = budgetUitl.getBudget(fund, report, inspectParameter); BudgetVo budget = budgetUitl.getBudget(fund, report, inspectParameter);
report.setBudgets(budget); report.setBudgets(budget);
inspectParameter.setId(UUIDUtil.getUUID());
parameterDao.save(inspectParameter);
} }
parameterDao.save(inspectParameter);
//填充地址(如果有) //填充地址(如果有)
report.setGitAddress(inspectParameter.getGitAddress()); report.setGitAddress(inspectParameter.getGitAddress());
//填充适配技术 //填充适配技术
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论