Accept Merge Request #75: (hyc -> master)
Merge Request: 【修改】判分进入条件 Created By: @华允传 Accepted By: @华允传 URL: https://g-iswv8783.coding.net/p/education/d/pengchen-exam-java/git/merge/75?initial=true
This commit is contained in:
@@ -290,7 +290,7 @@ public class AutoToolsServiceImpl implements AutoToolsService{
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
//windows文件处理
|
//windows文件处理
|
||||||
if (one_file.getName().equals("文件处理")) {
|
if (one_file.getName().split("\\.")[0].equals("文件处理")) {
|
||||||
File win_file = new File(one_file.getPath());
|
File win_file = new File(one_file.getPath());
|
||||||
double win_file_score = fileServerice.run_file_point(20.0,win_file, examQuestion);
|
double win_file_score = fileServerice.run_file_point(20.0,win_file, examQuestion);
|
||||||
score += win_file_score;
|
score += win_file_score;
|
||||||
@@ -299,7 +299,7 @@ public class AutoToolsServiceImpl implements AutoToolsService{
|
|||||||
}
|
}
|
||||||
//浏览器操作
|
//浏览器操作
|
||||||
// if ("浏览器网络题".equals(examQuestion.getCourseName()+examQuestion.getSubjectName())){
|
// if ("浏览器网络题".equals(examQuestion.getCourseName()+examQuestion.getSubjectName())){
|
||||||
if (one_file.getName().equals("网络题")) {
|
if (one_file.getName().split("\\.")[0].equals("网络题")) {
|
||||||
System.out.println(one_file);
|
System.out.println(one_file);
|
||||||
File edge_file = new File(one_file.getPath());
|
File edge_file = new File(one_file.getPath());
|
||||||
double browse_score= browserServerice.Judgement(20.0,edge_file,examQuestion);
|
double browse_score= browserServerice.Judgement(20.0,edge_file,examQuestion);
|
||||||
@@ -308,7 +308,7 @@ public class AutoToolsServiceImpl implements AutoToolsService{
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (one_file.getName().equals("程序设计")) {
|
if (one_file.getName().split("\\.")[0].equals("程序设计")) {
|
||||||
System.out.println(one_file);
|
System.out.println(one_file);
|
||||||
File mysql_file = new File(one_file.getPath());
|
File mysql_file = new File(one_file.getPath());
|
||||||
double judgement = mysqlServerice.Judgement(20.0,mysql_file, examQuestion);
|
double judgement = mysqlServerice.Judgement(20.0,mysql_file, examQuestion);
|
||||||
|
Reference in New Issue
Block a user