修改接口所在文件

src/main/java/com/tiptimes/ctrl/FileCtrl.java

@@ -147,9 +147,9 @@ public class FileCtrl {
                         fileName = file.getFileName();
                         String originPath = "";
                         if (fileNum.startsWith("http")) {
-                            originPath = fileName;
+                            originPath = fileNum;
                         } else {
-                            originPath = this.getfileUrl() + fileName;
+                            originPath = this.getfileUrl() + fileNum;
                         }
 
                         String targetPath = myPath + fileName;
@@ -220,7 +220,7 @@ public class FileCtrl {
             map.put("fileName", myfile.getOriginalFilename());
             map.put("fileID", uuid);
             byte[] buffer = myfile.getBytes();
-            FileOutputStream fos = new FileOutputStream(this.getfileUrl() + myfile.getOriginalFilename());
+            FileOutputStream fos = new FileOutputStream(this.getfileUrl() + fileNum);
             fos.write(buffer);
             fos.close();
             File file = new File();

src/main/java/com/tiptimes/ctrl/QuestionnaireCtrl.java

@@ -265,7 +265,7 @@ public class QuestionnaireCtrl {
         if (!fileForExists.exists()) {
             FileUtil.mkdirFolders(myPath);
         }
-        List<String> fileID = this.fileServer.selectFileId(optionId,recordId);
+        List<String> fileID = this.questionnaireService.selectFileId(optionId,recordId);
         for(int i=0;i<fileID.size();++i) {
             File file = this.fileServer.selectFileByFileID(fileID.get(i));
             try {

src/main/java/com/tiptimes/dao/FileDao.java

@@ -6,8 +6,6 @@
 package com.tiptimes.dao;
 
 import com.tiptimes.model.File;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 public interface FileDao {
@@ -18,7 +16,4 @@ public interface FileDao {
   List<File> listFileByFileID(String var1);
 
   List<String> listFileNameByFileID(String var1);
-
-  List<String> selectFileId(@Param("optionId") Long optionId,
-                            @Param("recordId")Long recordId);
 }

src/main/java/com/tiptimes/dao/QuestionnaireDao.java

@@ -32,4 +32,7 @@ public interface QuestionnaireDao {
     Record selectById(Long recordId);
 
     List<Record> selectRecordList(Record record);
+
+    List<String> selectFileId(@Param("optionId") Long optionId,
+                              @Param("recordId")Long recordId);
 }

src/main/java/com/tiptimes/service/FileService.java

@@ -2,16 +2,12 @@ package com.tiptimes.service;
 
 import com.tiptimes.model.File;
 
-import java.util.List;
-
 public interface FileService {
   File selectFileByFileID(String paramString);
   
   void saveFile(File paramFile);
   
   String updateFile(String paramString1, String paramString2);
-  //根据选项id查询文件对应id
-  List<String> selectFileId(Long optionId,Long recordId);
 }
 
 

src/main/java/com/tiptimes/service/QuestionnaireService.java

@@ -86,6 +86,9 @@ public interface QuestionnaireService {
    * @return
    */
   List<Record> selectRecordList(Record record);
+
+  //根据选项id查询文件对应id
+  List<String> selectFileId(Long optionId,Long recordId);
 }
 
 

src/main/java/com/tiptimes/service/impl/FileServiceImpl.java

@@ -45,14 +45,4 @@ public class FileServiceImpl implements FileService {
 
         return "";
     }
-
-    /**
-     *
-     * @param optionId
-     * @return
-     */
-    @Override
-    public List<String> selectFileId(Long optionId,Long recordId) {
-        return fileDao.selectFileId(optionId,recordId);
-    }
 }

src/main/java/com/tiptimes/service/impl/QuestionnaireServiceImpl.java

@@ -131,4 +131,9 @@ public class QuestionnaireServiceImpl implements QuestionnaireService {
     public List<Record> selectRecordList(Record record) {
         return questionnaireDao.selectRecordList(record);
     }
+
+    @Override
+    public List<String> selectFileId(Long optionId, Long recordId) {
+        return questionnaireDao.selectFileId(optionId,recordId);
+    }
 }

src/main/java/com/tiptimes/util/FileUtil.java

@@ -156,6 +156,7 @@ public class FileUtil {
 
     public static File copyFileByPath(String originPath, String targetPath, String targetPathForRepeat) throws IOException {
         File targetFile = new File(targetPath);
+
         try {
             BufferedInputStream input = null;
             if (originPath.startsWith("http")) {
@@ -172,16 +173,20 @@ public class FileUtil {
 
             byte[] buffer = new byte[1048576];
             int bytesum = 0;
+            boolean var8 = false;
+
             int byteread;
             while((byteread = input.read(buffer)) != -1) {
                 bytesum += byteread;
                 fps.write(buffer, 0, byteread);
                 fps.flush();
             }
+
             fps.close();
             input.close();
         } catch (Exception var9) {
         }
+
         return targetFile;
     }
 }

src/main/resources/mapper/File.xml

@@ -46,8 +46,4 @@
         where pf.FileID=#{fileID}
         AND pf.UserLifeCycle=0
     </select>
-
-	<select id="selectFileId" resultType="java.lang.String">
-		select `value` from t_answer where options_id=#{optionId} and record_id =#{recordId}
-	</select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/Questionnaire.xml

@@ -111,4 +111,8 @@
 			AND process_status #{processStatus}
 		</if>
 	</select>
+
+	<select id="selectFileId" resultType="java.lang.String">
+		select `value` from t_answer where options_id=#{optionId} and record_id =#{recordId}
+	</select>
 </mapper>
\ No newline at end of file