xiatian 2 ani în urmă
părinte
comite
49bbe65863

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/AbsentImportTask.java

@@ -56,7 +56,7 @@ public class AbsentImportTask extends AbstractTask {
         Set<String> subjectCodes = new HashSet<>();
         Set<String> examNumbers = new HashSet<>();
 
-        File file = new File(SysProperty.DATA_FILE);
+        File file = new File(SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE);
         try (LineIterator lines = FileHelper.readLines(file);) {
             while (lines.hasNext()) {
                 String line = lines.nextLine();

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/CourseImportTask.java

@@ -50,7 +50,7 @@ public class CourseImportTask extends AbstractTask {
 
         int total = 0;
         List<Course> list = new ArrayList<>();
-        File file = new File(SysProperty.DATA_FILE);
+        File file = new File(SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE);
         try (LineIterator lines = FileHelper.readLines(file);) {
             while (lines.hasNext()) {
                 String line = lines.nextLine();

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/ExamImportTask.java

@@ -47,7 +47,7 @@ public class ExamImportTask extends AbstractTask {
             throw new StatusException("导入模板目前仅支持后缀名为“.txt”的文件!");
         }
 
-        File file = new File(SysProperty.DATA_FILE);
+        File file = new File(SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE);
         List<String> lines = FileHelper.readAllLines(file);
         if (CollectionUtils.isEmpty(lines)) {
             log.warn("导入文件内无数据!");

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/ExamStudentImportTask.java

@@ -56,7 +56,7 @@ public class ExamStudentImportTask extends AbstractTask {
         Set<String> subjectCodes = new HashSet<>();
         Set<String> examNumbers = new HashSet<>();
 
-        File file = new File(SysProperty.DATA_FILE);
+        File file = new File(SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE);
         try (LineIterator lines = FileHelper.readLines(file);) {
             while (lines.hasNext()) {
                 String line = lines.nextLine();

+ 5 - 4
src/main/java/cn/com/qmth/scancloud/tools/service/impl/ExcelToTxtTask.java

@@ -32,17 +32,18 @@ public class ExcelToTxtTask extends AbstractTask {
 
     @Override
     protected void execute() {
-        String fileSuffix = FileHelper.getFileSuffix(SysProperty.DATA_FILE);
+        String filePath=SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE;
+        String fileSuffix = FileHelper.getFileSuffix(filePath);
         if (!fileSuffix.endsWith(".xls") && !fileSuffix.endsWith(".xlsx")) {
             throw new StatusException("目前仅支持后缀名为“.xls“或”.xlsx”的文件!");
         }
 
-        File excelFile = new File(SysProperty.DATA_FILE);
+        File excelFile = new File(filePath);
         if (!excelFile.exists()) {
-            throw new StatusException("Excel文件不存在!" + SysProperty.DATA_FILE);
+            throw new StatusException("Excel文件不存在!" + filePath);
         }
 
-        String txtFilePath = SysProperty.DATA_FILE.replace(fileSuffix, ".txt");
+        String txtFilePath = filePath.replace(fileSuffix, ".txt");
         File txtFile = new File(txtFilePath);
         if (txtFile.exists()) {
             FileUtils.deleteQuietly(txtFile);

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/StructImportTask.java

@@ -64,7 +64,7 @@ public class StructImportTask extends AbstractTask {
         }
         File file = new File(SysProperty.DATA_DIR + "/" + SysProperty.STRUCT_IMPORT);
         if (!file.exists()) {
-            throw new StatusException("文件不存在:" + SysProperty.STRUCT_IMPORT);
+            throw new StatusException("文件不存在:" + SysProperty.DATA_DIR+"/"+SysProperty.STRUCT_IMPORT);
         }
         InputStream inputStream = null;
         try {

+ 1 - 1
src/main/java/cn/com/qmth/scancloud/tools/service/impl/UserImportTask.java

@@ -45,7 +45,7 @@ public class UserImportTask extends AbstractTask {
 
         int total = 0;
         List<User> list = new ArrayList<>();
-        File file = new File(SysProperty.DATA_FILE);
+        File file = new File(SysProperty.DATA_DIR+"/"+SysProperty.DATA_FILE);
         try (LineIterator lines = FileHelper.readLines(file);) {
             while (lines.hasNext()) {
                 String line = lines.nextLine();

+ 1 - 1
src/main/resources/application.properties

@@ -14,7 +14,7 @@ scan.tool.template.separator=,
 
 #############params config###############
 scan.tool.data-dir=/home/admin/scan-tool
-scan.tool.data-file=${scan.tool.data-dir}/data.txt
+scan.tool.data-file=data.txt
 scan.tool.marking-place=marking-place.xlsx
 scan.tool.struct-import=struct-import.xlsx
 scan.tool.exam-id=