更新阅读论文接口

pom.xml

@@ -61,6 +61,11 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
 
     </dependencies>
 
@@ -77,8 +82,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>10</source>
+                    <source>11</source>
-                    <target>10</target>
+                    <target>11</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/com/bupt/note/Controller/FileController.java

@@ -8,6 +8,7 @@ import com.bupt.note.ResponseData.ResponseDataUtil;
 import com.bupt.note.dto.FileForm;
 import com.bupt.note.dto.QueryContent;
 import com.bupt.note.service.FileService;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 论文文本管理接口
@@ -64,13 +66,13 @@ public class FileController {
     }
 
     @GetMapping("find")
-    public ResponseData get(QueryContent queryContent,@CookieValue("user") String username) {
+    public ResponseData get(QueryContent queryContent,@CookieValue("user") String username) throws IOException {
         if (paperNoteRepository.existsByPaperIdAndUserName(queryContent.getPaperId(),username)) {
             PaperNote paperNote=paperNoteRepository.findByPaperIdAndUserName(queryContent.getPaperId(),username);
-            return ResponseDataUtil.buildSuccess(paperNote.getUrlPath());
+            return ResponseDataUtil.buildSuccess(FileUtils.readFileToString(new File(paperNote.getFilePath()), StandardCharsets.UTF_8));
         }else if(fileRepository.existsById(queryContent.getFileId())){
             com.bupt.note.Model.File file=fileRepository.getOne(queryContent.getFileId());
-            return ResponseDataUtil.buildSuccess(file.getUrlPath());
+            return ResponseDataUtil.buildSuccess(FileUtils.readFileToString(new File(file.getFilePath()), StandardCharsets.UTF_8));
         } else{
             logger.error(String.format("论文文件id=%d不存在", queryContent.getFileId()));
             return ResponseDataUtil.buildError();

src/main/java/com/bupt/note/Controller/NoteController.java

@@ -49,6 +49,7 @@ public class NoteController {
     @PostMapping("add")
     public ResponseData addNote(@RequestBody NoteForm noteForm, @CookieValue("user") String username) {
         if (noteForm.getPaperId() != null && StringUtils.isNoneBlank(noteForm.getNoteId(),
+                noteForm.getOriginalText(),
                 noteForm.getNoteTitle(), noteForm.getNoteContent(), noteForm.getContent())) {
             Note note = noteForm.toNote();
             note.setUserName(username);

src/main/java/com/bupt/note/Model/Note.java

@@ -14,6 +14,7 @@ public class Note implements Serializable {
     private String noteContent;
     private Long paperId;
     private String userName;
+    private String originalText;
 
     @Id
     public String getNoteId() {
@@ -59,5 +60,14 @@ public class Note implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    @Column(nullable = false)
+    public String getOriginalText() {
+        return originalText;
+    }
+
+    public void setOriginalText(String originalText) {
+        this.originalText = originalText;
+    }
 }
 

src/main/java/com/bupt/note/dto/NoteForm.java

@@ -9,6 +9,7 @@ public class NoteForm {
     private String noteId;
     private String noteTitle;
     private String noteContent;
+    private String originalText;
     private Long paperId;
     private Long fileId;
     private String content;
@@ -61,8 +62,17 @@ public class NoteForm {
         this.fileId = fileId;
     }
 
+    public String getOriginalText() {
+        return originalText;
+    }
+
+    public void setOriginalText(String originalText) {
+        this.originalText = originalText;
+    }
+
     public Note toNote(){
         Note note=new Note();
+        note.setOriginalText(this.originalText);
         note.setPaperId(this.paperId);
         note.setNoteContent(this.noteContent);
         note.setNoteTitle(this.noteTitle);

src/main/java/com/bupt/note/service/FileService.java

@@ -6,8 +6,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ResourceUtils;
 
-import java.io.File;
+import java.io.*;
-import java.io.FileNotFoundException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
@@ -28,4 +27,19 @@ public class FileService {
         return new File(txtDir, UUID.randomUUID() + ".txt");
 
     }
+
+    public String getContent(String path) {
+        StringBuilder sb=new StringBuilder();
+        try (BufferedReader reader = new BufferedReader(new FileReader(path, StandardCharsets.UTF_8))) {
+            String tempString;
+            while ((tempString = reader.readLine()) != null) {
+                sb.append(tempString);
+            }
+            return sb.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            logger.error(String.valueOf(e));
+        }
+        return "";
+    }
 }

src/test/java/com/bupt/note/NoteApplicationTests.java

@@ -1,5 +1,6 @@
 package com.bupt.note;
 
+import com.bupt.note.service.FileService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,8 @@ import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import java.io.IOException;
+
 @SpringBootTest
 class NoteApplicationTests {
 
@@ -20,6 +23,9 @@ class NoteApplicationTests {
 
     protected MockMvc mvc;
 
+    @Autowired
+    private FileService fileService;
+
     @BeforeEach
     public void setUp() {
         mvc = MockMvcBuilders.webAppContextSetup(context).build();
@@ -35,5 +41,8 @@ class NoteApplicationTests {
     }
 
 
-
+    @Test
+    public void testRead() throws IOException {
+        String a= fileService.getContent("E:\\JetBrains\\IdeaProjects\\back-end code\\target\\classes\\resources\\static\\txt\\1aee7062-58a7-46e0-ba4d-84a9a14f4205.txt");
+    }
 }